Here’s a couple of images and a new video showing some recent progress:
The new waterfall:
Here’s how we layered the normal maps to get the effect (just for the water)