I just replaced my waterpump and thermostat myself. It is not that tough to replace. As long as you have the sockets and a decent extension you can get to the waterpump. I did check the shroud inside the pump and mine was securly fastened. If you replace the thermostat be sure to get a new oring seal that fits on top of the thermostat. When I took mine apart I found it on the back!!!!!
