Playing Y, my party is Noivern, Scrafty and Aegislash. Or going to be once I evolve Noibat and Doublade.

I'm thinking I should add something that can surf. Right now I'm just using the gift Lapras as a surf slave. It provided useful at the fairy gym leader when I had it perish song the Sylveon to death when I was otherwise screwed.

Maybe a Swampert would be good? Or even Quagsire? Gotta love Quagsire.