According to the bios screen, the fan was running about 5000 to 5500 rpm. And the temp would actually go up while it was sitting in the bios screen with me watching it.
I decided to try a different one, so I got CompUSA's "Copper Pro Gamer Fan" which is rated to 2.2ghz. At first it seemed ok. But then the temp started rising again. The only way I can keep it cool is to leave the side cover off, and have a fan blowing into it.
I think maybe the CPU is damaged.