I've read your acelleration issue:
why don't add two compressors and a lapras from the basic XY set?
With the first attack, seafaring (Only 1 Water) , you can flip a coin up to three times, and attach a basic Water energy from your discard pile to a pokèmon for each head! :)
And the compressors...