Given the previous history you mentioned on old engine , I still lean towards the radiator.
By the way most modern cars use the heater matrix as a further heat sink, so if bypassed whilst it would not be the answer it may not be helping the situation.
By the way most modern cars use the heater matrix as a further heat sink, so if bypassed whilst it would not be the answer it may not be helping the situation.