OK, just got to Nimbasa City, about to challenge the Gym Leader with the current team:
Roselia / Pierced
Magmar / Magster
Croagunk / Toxic
Crawdaunt / Crusher
Aren't my names so creative?
Just evolved my Corphish and Magby into Crawdaunt and Magmar, both are a lot better.