Just dump Vaporeon altogether. Stick Jolteon in instead.
Vaporeon is just an annoyance and any Safeguard Lapras can rape it.
Jolteon @ Leftovers
Evs: 252 SpA / 4 HP / 252 Spe
Nature: Timid
- Yawn
- Protect/Sub
- Thunder/Charge Beam
- Rain Dance/Button Pass
Of course, Button Pass and Charge...