I don't know what your best choice would be, but some other responses to you mention the fan clutch. I seem to remember those being problematic.

Also any other accessory that shares a belt with the water pump, especially the crank pulley for excessive wobble... Login to read more.