I actually want to combine the three sets together in the same map, but it's a good suggestion.
I could probably play with colours and do #2 myself - in sets 047 and 048 it looks like the only "water" effect is on the surface of the water - the rest is just tinting. But my skills fall way short of being able to do #1.