Here's a novel idea: charge market prices for water based on supply and demand. The problem will sort itself out.
http://www.followthemoney.org/entity-details?eid=6468626
The solution is not more politics (and absurdly limiting water at restaurants) but real prices.
But even simpler than that, if you let people with water rights sell their water, they will be less likely to waste it.
Or maybe get rid of water rights...
Magic doesn't.