Hi stem,
thank you for taking the time for such a detailed write up.
I have already changed the "dumb timer" to a digital two channel one, which is a Centaurplus C27. The next step should be the thermostat.
It doesn't have to be wireless, but the living room qualifies for all the points you've...