So, /vp/, running through White 2 for the first time; going to fight the Elite Four; this is my team.

Emboar
Heat Crash/Hammer Arm/Head Smash/Strength

Leavanny
Leaf Blade/X-Scissor/Return/Swords Dance

Electivire
Thunderpunch/Low Kick/Return/Thunder Wave

Braviary
Return/Fly/Superpower/Rock Slide

Vaporeon
Surf/Blizzard/Shadow Ball/Quick Attack

I need a sixth I think? These five have been doing pretty well to cover everything.

Also, moves to replace Quick Attack on Vaporeon?