King Napoleon.... wut.
I think your best bet is to stick with Omastar, or maybe go with something that's a bit more bulky. Like Barbaracle. UM. But if you're talking a pokemon for surf, Vaporeon, Lanturn, Omastar, or Empoleon (Is Empoleon the King Napoleon people speak of?). Considering Vaporeon can learn aurora beam, has a high HP base stat, good SpAtk stat, and can learn acid armor and also learns surf, you have a pretty good pokemon right there if Ciel decides that its time to fuck you over with a physically strong archeops or gliscor or something (I dont actually know the pokemon ciel has, I havent played this ep yet lol), although archeops is kind of a bad example since it's ability is fucking defeatist (I mean REALLY? WHY?)
So yeah I'd go with Vaporeon but thats just me, really. (EDIT: I completely forgot to mention that vaporeon has an awkward speed, however, so you'd have to work around that e.e)
And just a recommendation but it's a good idea what you've, DONT GO WITH GYARADOS. There's just too many flying types that could wreck dis flying fish koi thing. Although, with Moxie and Ice Fang, it could easily sweep the other team. But if you ask me, theres still that high chance something might just have a quick claw. And Thunderbolt. Like Togekiss. Again, I wouldn't know, so yeah... lol but yes thats my opinion on the matter if you wish to take it into consideration \(^-^)/