I replaced the the temp sensor & so far so good, no surge or engine light. I won't get too excited just yet because I thought i solved the problem when I changed the spark plugs. I was watching the temp on diagnostic mode & all seemed fine, reaching up to temp normally.
I'll do another cold start tomorrow & hope for the best.