Rather than doing all that logic yourself, perhaps just use one of these apps that track time-of-device-in-state for you.
You might need a rule that toggles a virtual switch when the Operating State of your tstat goes into or out of heating. Then track that virtual switch with either of these:
