Short water passages need not be slow! When entering water from land reverse your direction at the last second and you will fly through the water much faster than if you'd been pushing the direction you actually wanted to go.
o pushing right before entering water
|-
~~~~~~~~~~~
==================================
o push left at the last second before entering water
|-
~~~~~~~~~~~
==================================
Swim fast for a short period of time!
~~~~~~~~~~~~~~~~~
|-o
|