An experiment again, using Daniil's erosion shader in river mode. All in one layer, so next might be to do an extra water layer and see what that does. I started doing a PT render, but after 2.5 hours it slowed down to an absolute crawl over the water (without even RT reflections), so this is standard (50mins).