Also, I've just come up with a new pokemon which might completely not do the job for you, but in the rain it isn't very bad: Metagross.
Talking about your team weaknesses it only adds one extra, being ground (Obviously, fire is not super effective in the rain anymore).
A Choice Banded, Adamant...