I was told that the water pump should be done at my next timing belt change...but I'm just a little "iffy" about the tensioner.

I'm assuming he checked the tension with the belt on it.