[geezer#99]

With the bypassed heater core do you have the line off the intake plumbed back into the water pump or do you have both plugged.
Sometimes that can create a heat problem.