Dave,
While we didn't have many problems like you had with the pin-type mounting, it wasn't too long after your car that we changed to an external mounting system for both our standard and optional fans.
Unfortunately, even the standard fan was changed with the new mounting system, so you'll have to update the fan too. The new standard fan is about 20% more powerful than your current one.
If you have lots of spare cash
, you might consider updating to the aluminum radiator and new shrouding at the same time. Give Bryan or Peter a call for the $ details.