Cooling Issue

I think you are going to have better luck with it now, as you would be surprised how much air comes off the tips of the fan.
With the fan deep inside the shroud all that air coming off the fan tips blows out against the inside of the shroud instead of out of it and therefore pulling more air volume through the radiator.
Was going to ask you about the depth and idle RPM's both. :D
When I saw the first picture, and saw how close the fan was to the radiator, I was going to jump in and say that you want the fan blades about half in and half out of the shroud. It looks like you've done that, and I agree with Trailbeast in that your problem may be solved.