Having a second bypass or not having the heater core hooked up has no play in over heating. I would have the radiator checked out, or buy new. I would remove the flex fan and go back to a seven blade with a clutch, maybe get a more suitable fan shroud. I would check the pulley ratios and install a new pump 8 vanes with the plate or 8 vane cast unit...…...
