Recurring dreams can be dealt with ok-ish if you can learn to lucid dream. You gain enough control to do things like keep your head out of the water just in time or have the wave end up much smaller or weaker than it should be. It's not perfect but the control allows you to slowly gain the ability to move on. I don't know how to instruct you on it. I learned as a child out of self-preservation. I know that I keep a sense of consciousness to do it. I am aware and thinking while dreaming. I manipulate the dream in the same manner as when you're imagining a scenario while awake but it does take a lot of mental effort. Hopefully you find something better than this but it's an option to pursue if you don't.