Did you have any joy with the heating issue, in the passed I had a similar issue and it was the relay mounted on the front of the battery, behind the headlight was disconnected, reconnected and got a lot hotter, something to do with the split cooling system.
But I am now having a issue 2015 FR 1.2 TSI where the car takes ages to warm up so am investigating too, I also see one pipe hot and the other cold going in the matrix, I am wondering if the cooling system is not closed for initial warm up.