Problem solved hopefully, it was software all along
Re heat I can understand that, I think it depends how much you trust Apple & Jonny Ive. I think your only options are to run SMCfancontrol, but that's a bit of a pain, or change the paste which IMHO is mostly voodoo, I am not convinced that it really makes a difference with newer Macs.