Something that stands out to me initially is that, in terms of bulky, specially-offensive water types, you may want to consider swapping Vaporeon for a Tapu Fini.
Tapu Fini can run a couple of different sets that fill similar roles to the Vaporeon set your currently running, while offering...