As a response to Shiny missingno, I think ill keep swift swim, for if i get a crit, it usually KO's anyway. T-tar is also dangerous to bring in on a water pokemon.
As a response to rain xspear, Ill try that suggestion out and see how it does.
As always thanks for comments and constructive...