Just to add, the hardest part was getting the heater box out of the engine bay, once it was out, it was quite straightforward to replace the heater matrix and give the whole thing a general service.
For a days faff and 30 quid on the new matrix, it's worth a punt to see if the OG heater can...