I have just had a very similar problem, and as the car was in for the recall, I asked them to look at it. They disconnected the battery for the recall, and when they reconnected to investigate the heater problem it had gone, along with a TPMS warning also. So I'd definitely try battery disconnection for a while, I think it's 40 mins to 'forget' everything.