I agree with the water pump and will be changing mine as well, that's what made me think about the thermostat. The water pump is known to fail though but I'm wondering what really is the chance of the thermostat failing ?