Hi there!
Some quick notes on swimming after watching your video: you can use the movement controls to aim and the jump button to swim more slowly than charging. And, charging underwater can also be controlled with the mouse (both by right clicking to charge and moving the mouse to aim). There are also inputs settings (such as underwater up/down aiming inversion and axis mapping) in the menu.
Thanks for the feedback, and thanks again for sharing your gameplay footage!