What I understand from the warranty stuff, the water pump is covered by the 10/120.
As stated before, do go the extra mile and have the belts and all of the extra suff replaced at the same time... My dealer is cool and lets me bring in my brand of items and just charge for labor..