Let's think about what is happening. When you are on the freeway, the motor is running harder and generating more heat. The high rate of airflow through the radiator can still cool it. When you decrease the airflow through the radiator, it can't handle the residual heat in the motor. To me this sounds like either the fan isn't working right, or the radiator is too plugged up. Make sure that the viscous engine driven fan clutch is working right. Turn engine off when hot and it should be stiff to turn. How is electric fan? Is it running? To test the water pump issue, when you get off the freeway, pull over and hold the throttle at about 2500RPM in neutral and see if the engine cools down. If it does, the pump may not be circulating enough water at lower rpms.