If it's ok on the highway and not around town you have an airflow problem at low speed.
What does the mechanical fan look like? Is it one of those awful 4 blade fans? Or have you upgraded? If it's one of those original 4 blade fans you've found your problem, those things are terrible. And you need a fan shroud, because that significantly improves the efficiency of the mechanical fan.
