welcome. with regards to the water pump, it's really up to you whether you get it and the belt replaced early.
personally, i'd leave it until the next timing belt change is due and in the meantime, just keep an eye out for any indications that it might be failing. typical symptoms are a ticking noise from the timing belt area (bearings starting to go in pump), or coolant starting to disappear (pump starting to leak).