I'd tone down the Magikarp, too.. what if that ended up being all you were stuck with? 3 Energy is what it takes to evolve him, if someone attacks even 10 each turn, it might be too late.
Magikarp from Fire Red/Leaf Green set takes only 2 Energy, (W)(*), to use the move Ascension, which is the same as Rapid Evolution. Although his first attack is a little iffy.. (*) Surprise Attack - Flip a coin. If tails, this attack does nothing. I hate coin flipping >.>
Anyway, also think about putting in a Neo Genesis Feraligatr (lvl 69). He has an attack that adds 10 damage for each Water Energy in your discard pile and then reshuffles each energy back into your deck.
Also, consider a Blastoise.. Poke Power: Put down as many Water Energy as you want on your Water Pokemon. Very handy, another cool beast is Swampert, who has Water Cyclone, it's like Energy Trans but for Water Energy.
As for trainers, tone down the energies to about 20 and put in some Bill's Teleporters, Prof. Birch, Prof. Elm's Training Method or Wally's Training, or Great Ball.. those will help you get the Basic and Evolution cards you need.
Believe me though.. I sort of speak from experience when dealing with this type of deck. My whole deck is Water and has a lot of the same that yours does.
