Bypass the heater matrix, which probably has the airlock, by linking the input and output feed at the engine bulkhead. If it doesn't overheat, you know where the issue is. My old 300Tdi had a blocked heater and it seems any issue with the heater flow will affect the main system.