I'd recommend Protect over Substitute on Vaporeon, it's a more sure way of stalling for the Wish health. I wouldn't say rebuild the entire thing. It looks like just a decent no-weather team at this point. I'd be curious to see how it fares against a sun team, though.