four Words:
Get a fan Shroud! It will make a huge difference.
Actually, There is one thing that you have not mentioned that will tell you where your problem is. How does the car act temperature wise when you are at speed (45 MPH+) like on the freeway? If you stay cool at speed and...