No need to do the waterpump at the same time as the cambelt as that's driven off the auxiliary belt, but i would do the cambelt idler pulley while it's all apart.