Simplifying the water
After I block in the shapes, I will alpha lock each layer (Select layer>Alpha lock); this way I know I can do broad strokes that will stay confined to the blocked shape. I repeat the same process for the foam on top; I push, pull and erase parts of the shape until I’m happy with it.