Have you checked the heater matrix, I.E damp footwells as well, to check for HG check the oil filler cap for "Mayonaise" and also inside the header tank for any signs of an oily film, this is where the two are mixing together meaning HG failure.
Martin