I might say lose vaporeon and add Reuniclus. You gain a fighting resistance and Reuniclus can be manipulated in many different ways.
Defensive Calm Mind
Reuniclus w/ Leftovers
Ability: Magic Guard
Bold
EVs: 252 HP; 252 Def; 4 SpAtk
Calm Mind
Recover
Psychic
Thunder
Id go with this one personally