In a market economy this should correct itself. Avocados become pricier and demand slackens until we reach a price point that reflects the high water consumption. Pay $8 for an avocado you will eat less guacamole.
But I fear that our economy is too messed with for any rational adjustments.
Also California needs to double its reservoir system.
And build desalinization plants like the one in San Diego. Cancel the stupid train to nowhere, and you could build a dozen, each making 50M gallons per day, plus reservoirs. We also need to get rid of the outdated water rights that allow farmers to sell the water rather than grow crops, or irrigate as if the water is unlimited.