Update.
Indy did the fan and FSR yesterday. Pretty much spot on to the 6 hours for the entire job. He did remove the steering wheel (which was ok, seeing as when I put it on last I was out by a tooth and it was REALLY annoying me

).
No amount of lube would have fixed the fan. The bushings were worn right down to the holder and wearing it out. Hard to see, but the front of the pics show some bushing material, but at the back there is none.
Works beautifully now.
Cheers.