Yeah, making water sources private property might not turn out well.

But if the water sources are publicly managed and water consumption is priced progressively (and sustainably) at the source, I don't see what the problem is of letting markets do the rest.

Although water pollution should be addressed as well, but this is required regardless of the scenario.