Replacing as many parts as possible with new on the old overworked water pump assembly, when rebuilding the engine is a sensible precaution - the last thing a newly refurbished engine requires is a weak flow of coolant!
You may wish to view this relate item:
19231500030
It is always worth checking carefully that the part number you specify is compatible with your model before placing you order, this helps avoid the frustration of ordering an incorrect part! CMS try to ensure that online purchasing of Japanese motorcycle spares is a pleasant and user friendly experience!