One thing you could do is desalinate water in Los Angeles, and thus keep the water in the central valley rather than pumping it over the grapevine. I'm pretty sure agricultural use of water in CA dwarves urban use, so maybe it wouldn't make that much of a difference. (Maybe someone can find actual numbers, sorry I can't right now.)