We have two options: it can be source of the water or cannot be. If it's a clean running water - it's an 'amenity=drinking_water' (with some additional tags if you want). If it's just a through without _running_ water source, it's NOT a drinking water. That's it. 
All OSM notes should be used as a temporary remarks that should be moved to the main map, please store garbage like 'I washed my head here' somewhere else (with your 'feel of the bottle', haha).