[dendrite9]

And do what about the geography?

Changing the laws is not something that just happens and solves everything. If we're fixing legal doctrines from westward expansion of the US there is a lot to fix. I'd propose taking back the patchworks of land gifted to the railroads, or at least forcibly consolidate them into contiguous blocks.

Maybe those water rights should be given to the tribes who used to live in the watersheds. Let them set the prices.