allow some pokemon that can fly, to swim(for example, lugia, latias, latios, Garchomp), and what ever else that can learn "surf"

the water movement type is more for mobs that can actually swim under water, like fish, etc.

for things that can surf, there is a surf_allowed tag instead you could add them to