A warforged or necropolitan would be great, since they can't drown.
Taking the monk ACF to walk on water would also be a good idea.
And with that, Tashalatora suddenly becomes a viable option, so we end up with some psions, ardents, and psywars (all of which are great underwater).
Also, a psychoactive skin of proteus is incredible here (as it is everywhere else). You've got any number of forms to play with in the water, from objects that don't need to breathe (and can be used as transportation) to animals that can swim or fly (and can breathe water if need be).