I would take out Kingdra entirely. He helps get knockouts with Yanmega or magnezone sometimes, but more often than not he's just waiting to be brought up by catcher IMO.
That will give you room for some more energy as Magnezone does love to eat through that energy. Yum yum
-1-1 Kingdra Prime
+2...