Mine was doing the same thing with a stock engine. I put in a brass 3-row rad., same thing kept happening. I put in a taurus elec. fan and it stopped the heating up at idle, even with AC running in the FL heat. The underdrives are not helping matters for sure.
One more thing, if you are...