By right need to change the tensioner too and all the seals. This is because to open up is difficult and cost a lot too. I see you are ready to change the water pump already even though old one still running fine. This is same case, since open up, might as well change, if not the water pump breaks down later, you have to open up again.
