Flight would throw a large advantage although you stick out like a sore thumb, getting all attention

Diving would give you an unlimited time underwater + great sights although less of an advantage.
I would go with flying for as long as i can cover it with some sort of jet-pack or a suit a lá Iron Man
Would you rather place yourself into an armor that would keep you alive irregardless of the wounds inflicted or be able to withstand all sorts of damage whilst naked.