I replaced the heater core in my HQ with an aluminium aftermarket one Rare Spares (or Kingswood Country? - I don’t remember) core about 5 years ago. It fitted fine and I’ve not had any issues.