my tj had the rusty water, i replaced the pump/tstat/hoses/radiator all at one time, still rusty, i ended up flushing out the heater core seperatly and it helped ALOt, might want to give that a try, if the heater core is clogged up it will cause issues.

plus its really easy to do like 5-10 minutes at the most.