Swimming Issues

This is a continuation of my other question, @BRGEzedeRocco was looking to help me.
The problem I’m having is that my buoyancy is a little rough when following the waves (GerstnerWaves), my character doesn’t follow them smoothly. Along with that, when swimming along the surface of the water, my system thinks my character is underwater..