If you are talking about all of the bodies of water relations I added, you should note that two of the reasons I put those in was for the benefit of the OpenSeaMap project and of users of Garmin devices.  I would ask that you leave all of those relations untouched, and try to find a suitable compromise between your desire for more efficient relations and my desire to maintain this toponymic schema.