I just had the same with mine. Fitted Dan's 300 engine, new water pump, heater matrix & thermostat but was still over heating.
I'd get a sniff test done or check you don't have air bubbles blowing out your header tank before you start pulling it apart.
I replaced everything on mine, even the...