If your engine overheats my 2 cents would be on a faulty fan clutch on the cooling fan behind the radiator. It shall engage around 90C and you should really hear it blow air when from 2000 rpm.
So your saying the clutch fan might be causing the over heat? The fan behind the rad that's on the motor does turn on and stay on