Isn't this a trivial economic problem? Efficient allocation of scarce resources is one of the strengths of capitalism. If almond farming isn't viable in California due to water being scarce they should naturally just get priced out of the market, right? Why isn't this problem solving itself?