Agree, Range Mode is the energy saver in towns, or where you arr driving short distances without a need for charging on superchargers.
Maybe the most elegant solution will be to implement an option under Range Mode:
Allow maximum cabin heater power
It will give you three options regarded to...