I think you're probably spot on for the recommendation of a water type, but I don't think that mantine is a great fit, or maybe I'm just biased against mantine. If I had to drop a mon right now, based on the way my games have been playing out, I'd drop Excadrill. Excadrill's roll right now is...