New Cooling/fan question

I am still trying to figure out what is up with my cooling system:

26" 3 core factory type downflow radiator
180 degree T-stat
50/50 mix coolant
Mopar high volume water pump.
Factory clutch fan, but it is absent a shroud because I planned to install an electric.

It obviously heats up in traffic w/o a shroud, but once I get out on the highway it continues to run hot (210+). Once it gets hot, it never really cools down. I am starting to think the water pump was a bad idea, and is pushing the water through the radiator TOO fast to transfer the heat.

It is only a 9:1 360 w/ 2.45 gears. I barely turn 2000rpms out on the highway, so I don't see why I have the cooling problems on the highway. It gets really ugly in traffic during our standard 100+ Texas summer days.

The car is already wired for a 30amp fan circuit with temp switch, and I tested a 14" Mr. Gasket fan just to make sure everything worked. The electrical is good but the fan wasn't even remotely big enough. The car overheated just sitting in the driveway on a 90 degree day.

I wanted to use a Viper fan/shroud (P5007266) but they changed from an offset fan to a center mount. With the center mount it doesn't clear the water pump pulley. Now I need to go another route, but I really wanted a shrouded system.

Does anyone know where I can acquire the old type Viper fan? Or, what type of fans are you running? I'm leaning toward a dual 12"" fan system of some type. After reading the other thread, I may also try using water wetter also.