I would start with replacing the fan too. At least you would have a working fan in the case of stopping in traffic on hot days. Also that would rule out the fan as the culprit.

__________________
2004 E53 diesel.
Titan silver on black
Sports package