While I hate the current housing gridlock, these laws represent a classic Chesterton fence. They were enacted precisely because "upzoning" fell heaviest on the poor, minorities, the elderly, and other functionally disenfranchised people.

Since I like sortition, here's a goofy idea... eminent domain should be of two sorts: adverse and voluntary. Voluntary is bought-and-done. Adverse means we pick some other property in a different part of the jurisdiction, at random, and also adversely posses it. To drive the point home, I'd bias the selection to be directly proportional to value, ie, the more valuable, the more likely to be selected. The lock up in the adverse possession should be no less than, say, 25 years, or the lockup on the original possession, whichever is longer.