If you can idle without problems, Once you are driving more than 25mph, you can eliminate the fan, shroud and clutch from the equation because you are getting more airflow than those components can generate when at those speeds.
I'd also look at water pump pulley to crank ratio. Make sure you overdrive the wp pulley
make sure the temp gauge is accurate
