After a bitter fight, Southern California's water kingpin has a new leader