You should consider a fan delete. Since you are there, get rid of the clutch and belt driven fan. Just get the kit from Understeer together with a new water pump. You will be safe for 100k more miles.
I am doing this now because my radiator started leaking. I am upgrading the whole cooling system (rad, cap, bleed screw, thermostat, water pump, fan switch, hoses, etc) because I don't want to have problems later on. If you're gonna do it, do it right. If you want to be on the safe side, you can add an electric puller fan to ensure max cooling during the summer.
My 2 cents.