Sam82, you may be a little "stiff" in your boat.
meaning you may be over leaning your upper body causing your centre of gravity to be falling out of the boat.
If you look at foating toolbox's first pic
viewtopic.php?f=46&t=28168&start=15you will see a slight forward lean and we have to assume he is hip flicking the boat back upright with the brace.
Let 's pretend this is not happening to you when you are crossing the boils, a straight rigid body will make any boat tippy.
The hips can be doing one thing and the upper body something else to keep your centre of gravity in the boat. A little more forward lean would also lower (strengthen) your centre.
Practice and Play.
Too many WW paddlers over think what the need to do.
Learn to use the water for your advantage and generally in bigger ww if you have to think about it, it is too late
As you learn, save each trick, sooner or later you will need them all.
Jeff