[Henry/Kokomo]

If you haven't already done so, check the timing. Retarded timing will cause the engine to heat. That would show up at idle speeds quicker than at highway speed.
In addition to a 6 bladed fan, a fan shroud might also prove useful. Do you know how the block was cleaned, internally, at the time of rebuild? That can make a difference, too.