IMO it would probably be a good idea to get rid of the excess houses while you can still control which house you keep, because you know SE will retroactively enforce the housing limit on all accounts eventually. I mean, look what they do with currencies.

4.2 effectively starts the beginning of the grace period because you know they'll force the issue down the line.