Oh, my bad. I thought for a moment that Starmie was a base 115 Speed pokemon, which Adamant Gyarados never outspeeds after a Dragon Dance.
I like the idea, but I think I'll consider both of Quick Man's ideas.
Yes, this seems perfect. Thank you for the help, I'll make the changes.