Overheating -- Corrective measure questions.
Oh one thing. "I" would get a two row radiator with the widest tubes you can find. Either 1.25" or 1.5". That radiator you have now is at least a three row. The two row core will actually cool better, believe it or don't and it will give you way more room between the fan and shroud. Probably just what you need to back that fan out some.
Sorry bout all this....we didn't mean to end up puttin a dent in your pocket book. ...but I do believe you will be successful.