What's its nature?
If it's Adamant/Brave/Naughty/Lonely/Impish/Careful/Jolly, evolve it into Flareon.
If it's Bold/Modest/Calm/Timid/Mild/Rash, Vaporeon or Jolteon would be your best bet.
If it's something else, any of them would probably work well.
Edit: Reading your post a little more carefully, I would strongly suggest Vaporeon if you plan on using it on your team. Gyarados shouldn't be using any water or ice moves, but Vaporeon should. If it's one of the natures I suggested for Flareon, you'll want to evolve it into Flareon instead though. Try another water type. Something really awesome, like, say... Slowbro!