Somethings is wrong with the puzzle order/logic. I too never found the water. I managed to do some other stuff, that seemed in the wrong order (I had items and information I didn't know about; I'll say no more not to spoil it for other players).
But otherwise, really lovely game!