Just a thought, but have you checked the temp gage? Is it really overheating or are you taking it for granted because the gage says it is. I'd try a new gage before I'd go swapping water pumps and radiators. Again, just a thought.