I vote for another heater core. I had overheating problems in my 85 Bronco and after changing everything else I bypassed the heater core, problem solved. So I cut out the heater core housing inside the engine compartment, pulled out the heater core, inserted new one and repaired the heater core...