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..

Helllo again @Br0kenWing ,
Regarding the first point, could you show how it looks in your case and what you currently have implemented? What do you mean exactly when you say the movement feels rough when following the waves?

And regarding the second issue, could you show how you have the swimming system configured?

sure thing, i have 2 videos to share. First is swimming in game, then Second is the blueprints. I had bought a project setup from another developer and built off that, but it need some tweaks that im not sure how to solve. Everything related to swimming is colored in the blue.
Seems Unreal forum wont let me upload it, here is links

p.s. i didnt realize xbox gamebar record my mic, might wanna mute the videos.. my bad