Aye, I figured I was missing something.
Tentacruel seems to slot in nicely, only sharing the electric weakness with Vaporeon. I guess I could replace Conkeldurr and use a set with Rapid Spin and Toxic Spikes. My team would have two electric weaknesses, but Mamoswine and Hydreigon can switch...