Do you know that it is actually overheating or are you just going off the gauge? I'd check that first if it hasn't been done already.
Also a heater tap that doesn't seal closed creates a loop in the cooling system that can cause over heating.
Goodluck.