I might try a different dealer/service advisor, with the age of the car and i'm guessing mileage. The SA should of known to replace the water pump (known issue) the same time they changed the thermostat, it's essentially the same work order.
So now your SA has billed warranty twice for the same amount of work = hitting sales target! And wasting your time... But i'm just speculating.