Did you have to have the fan replaced?? is the "viscous fan" just the normal engine cooling fan??

I am having exactly the same issue you were. When I accelerate hard I get a sound similar to a supercharger.....