Got the car back. They said that the timing belt tensioner bolt was way too tight, so they loosened it a bit and that solved the problem.

The water pump is not an automatic replacement - I've opted out of it on this one. I will be getting it done soon though.