Key adjustment to your first proposal: the additional property tax should also be waived when having long-term renters/occupants.