I personally believe the water pump and belt should be done, on the basis of assuring that it hopefully does not need doing in the future. "Belt and Braces" maybe, but could also be "First spend is the cheapest spend", or "Better safe than sorry".
Best Wishes and Regards, John