Neighborhood housing should be changed to be FC only housing and instanced housing should be introduced for individuals. Grandfather in anyone who already owns a plot to avoid butt hurt, but also introduce a property tax mechanic and reduce the timer for demolition to like two weeks for individuals. It's not perfect, but it's probably the best way to move forward without completely demolishing the old housing system.