Nice work Ulco, I completely sympathise with this subject being frustrating to crack. I think there's a way for you not to have to use a twist and shere node to get the curlers, which I'll need to check out at some stage. But from curler to break is quite quick, so I think we don't have to get too tied down with that part of the wave shape.
I've kind of ditched the water shader too, as it's quite render costly, and the look I'm after has quite a lot of foam on the shore edge. I've used something similar to your quick water shader set up you posted the other day.