I would suggest that you get a true, Toyota belt and not a Napa, Autozone, etc belt. The Toyota belt is a few dollars more and you can get it from the Toyota dealership since it shares the same engine as the N/A Supra; I saved $11.00 dollars. Now, based on MY experience, I could not for the life of me remove the bottom crankshaft pulley bolt even after my last ditch effort of ghetto-fying the removal by doing the starter bump; it still didn't work. I had the same Toyota dealership that I bought the belt from do the timing belt replacement (and they installed my new crankshaft pulley since my old one sheared off into two pieces on the highway two weeks prior). As for replacing the waterpump and knowing how expensive they are I would feel that you could wait until the next time you change the timing belt. Just do a complete cooling system flush (make sure you also turn on your heater to remove the old coolant that is in your heater core), replace the thermostat with a new one and burp the system.