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.