I've just sent the file to you, Oshyan.
Fixed(well, hid) the broken stones, the altitudes of the wet layer needed adjustment, I needed a really small patch size when the compute terrain node was after the stones to make the altitude constraints work properly and it was really increasing the render time, I changed my mind and finally settled on moving the compute terrain back up to before the stones layer and just used 'final normal' altitude constraints for speed, it did look better with the smaller patch size but it's still fine this way, and quicker.
And as I said in the pm, I hope I have the timings right for the water, I think it should be cool.
Thanks again!
p.s. I'm not seeing the yellow tint you mention here at my end. Does anyone else notice that?