Since you need to do the WP anyhow, I would definately take the opportunity to inspect the Opti. My old '95 9C1 had 14X,XXX miles on it when the water pump crapped out. I opted to just put a MSD cap and rotor on the Opti, as the optical sensor, bearings, etc., were all fine. Much cheaper than a whole new Opti. Be advised that you should also change all the seals in the timing chain cover as part of this work, or you WILL have oil leaks.