You could solve the problem just by making water cost more. Wasteful farming can't take the hit, residential users can. It doesn't take magic.

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...