If you haven't done a timing belt for a while, it would probably be a good idea to do that with the water pump, especially since you are coming up for another change of the belt in 10k miles, assuming it was changed at 90k miles.