From your discription, it appears the shop may have forgotten to tighten the fan after removing it to do the head gasket. This would account for the fan w/pully against the radiator. And as Arthur said, the shroud is a possibility as well.

__________________

Don't Chrome them; polish them