I've had the previous dealership attempt to address the fan drone/whine and they had replaced the belts, etc to my understanding. However, the noise was still there regardless.

I brought my car in for Service I and made a punchlist of little things here and there. Woohoo ! Fan drone noise is finally gone. They could not duplicate it on the same day but they kept the X for a 2nd day to be more thourough ! They identified the issue and addressed it !

I totally missed MD's post, who had similar issues and also had his water pump replaced. For those with the infamous fan drone/whine, just a FYI, but it may be the water pump. FWIW, mine is a '03 4.4