First off, why is your Manectric Jolly? I'm assuming that's a typo but if it isn't then change that to Timid.
I would be using Azumarill over Poliwrath if I were you to help with your slight Moltres weakness, Azumarill gets encore aswell so you can still use the same set if you like. If you do...