At one point, I also grouped ways based on natural=water. But my tool osm-lump-ways can’t do relations. So half the examples didn’t work. I turned that feature off.
I like connected waterways. IMO WWMorg should show both, to prevent people “mapping for the waterwaymap” 
. (BTW: OSM forum discussion on mapping through .)