Keeps getting to hot

It is a very tight fit in the engine bay. 3" 3/4 from face of the radiator to the back of the water pump. I recently made the fan shroud from fiberglass hoping that it would move more air. It covers the radiator from tank to tank and helped out a little bit. I have been looking at upgrading fans for a while now. Has anyone ever used Pro Comp fans?

[ame="http://www.amazon.com/PROCOMP-ELECTRIC-COOLING-AUTOMOTIVE-RADIATOR/dp/B001FTLNMO"]Amazon.com: PROCOMP 12" INCH ELECTRIC COOLING AUTOMOTIVE RADIATOR FAN CURVED 12 VOLT: Automotive[/ame]

I know you typically get what you pay for but it never hurts to get some actual user opinions.
The thermostat is a Middilon 180 high flow and the water pump is 40 GPM.
I was thinking that it wasn't getting enough air flow because of the motor plate causing cavitation. I have been thinking about cutting and moving the radiator forward as far as i can. I have measured an it might free up close to 1.5 inches.
the air/fuel ratio is usually around 12.8 to 1 at idle the goes down to 11/12 to 1 at cruising speeds.

I the attached photo is just a picture of my Zetronics ZT-2 duel setup with Dash Daq display. The car was off in the photo. It was not at 21.0 to 1.