That looks much better now, it has to be said .
I think Infernape is going to pose some problems, So just watch out for him. (Though Starmie/flygon/vaporeon SHOULD be able to deal with him.) They would also have to switch in on the nasty plot, if you let him get a nasty plot, then switch into him when he attacks he's taking something down.
There are probably a couple holes here and there, but testing should weed them out .
I'd recommend using HP Eletric on vaporeon, a lot of people will disagree with me, but vappy will then be a perfect gyara counter, It works wonders for me anyhow.
Something like
~ Wish
~ Surf
~ HP Electric
~ Protect/Toxic/Yawn/ Roar (if Vappy gets roar... not sure)