NV thanks so much for the advice.
Since I play mostly for fun I'm gonna keep my Granbull and mamoswine as is.
However the advice on Swampert, Empoleon, and Rotom are immense and will definitely be tested. Swampert was definitely lacking speed when confronted with the flower fairy and Empoleon...