boats glitchy at water surface

when riding a boat (normal conditions, not bubbles) the boat bobs wildly.

i see other boat related bugs, I suspect they are related.
This would be a cool mechanic if/when we get rapids