A water hazard is a particular feature on a golf course. A river bordering a golf course is a natural feature tagged with river tags. The fact that golfers avoid it doesn't make it a golfing feature.

Please don't get off topic. What I choose to do with my time isn't your business. I am not telling you my personal opinion, I am explaining the community's practices developed through years of editing. "Open"StreetMap doesn't mean "map things whatever way you like".

It's not great that you knew this edit would be an annoyance and proceeded with it anyway. Such attitude is common among mappers using this software, and contributes to why we've tired of it.