Alright, thanks for reflecting on this. I think I now managed to fix your changes around waterway/highway interesections, as well as some other stuff, without reverting it altogether:

https://www.openstreetmap.org/changeset/162247134