I'd go with the electric fan from the junk yard, then bypass your heater core and see if that cures it. Also, is your A/C running? The condenser in front of your radiator might need replacing as well.