Quick update.
I finally picked a new fan, this fan is from a Volvo, CFM is claimed to be around 3500-4000 but more importantly it has a very good shroud design. It also is thinner overall. The only drawback is that it only has a single speed but I will wire it into the high speed output. The fan shroud fits very well with minor trimming needed.
I need to make more room for the larger turbo that will be going in, to do this I needed to move the wiring harness that is normally between the radiator and the condenser, this wiring harness is now located in front of the condenser outside of the core support. In doing so I needed to make a new bracket for the condenser, to prevent it from moving side to side and pull it as close to possible to the core support. Here are some pictures of the bracket that I created.
Here it is installed:
Also notice I had to notch core support for the wires, also protected the wires in a high temp wrapping that has a velco backing.