Yeah, the first-hand contracts system is a disaster atm.

But note that waiting time only applies to first-hand contracts. You can still rent second-hand.

The idea would be to build much more, and buy up the former second-hand places.