'96 xj overheating prob

Need some help guys,
'96 xj 4.0 over heating prob's. Have r&r waterpump due to leak, flushed system, made sure the system was air free.
Should I upgrade the radiator and water pump and perhaps the electric fan?
I know the cherokee is notorious for poor stock brakes and cooling issues.
Any good advise will greatly appreciated.
thanks in advance,
butch

I had the same problem on my 96 XJ Sport 4.0. Went and had the radiator replaced, fixed the problem entirely. FYI - this happened at 125k miles; the radiator was nearly completely blocked with build-up.

I had the same issues with my 94 with 120k miles. Water pump went so I replaced the water pump, both hoses, thermostat, radiator, *and* the manual fan clutch. The radiator was a 3 core model and the XJ runs about 10 degrees cooler now and it's rare for the electric fan to even come on now.... I suppose my cooling system was barely keeping up for awhile and man can I tell now!