John Oliver just had a segment on water: https://www.youtube.com/watch?v=jtxew5XUVbQ
In the episode, there's literally a farmer that says that he grows a water inefficient crop deliberately in order to hold on to water rights (@ 8:38). "Use it or lose it" water rights are ass backwards to put it mildly.
Make agriculture figure how to use less water or face penalties. That's the way forward.