yes always replace the waterpump as if not and it goes out before the 210k mark the whole job has to be done again another thing is the hydrulic tensioner and tensioners and oil seals as if they fail or are leaking can cause the timing belt to fail.