They charged you a grand to change those few items - wowzer. You need to find a new shop my friend - preferably a good independent in the area.
The valve cover gasket and thermostat most definitely, not real sure about the water pump on this model.
You need to open up cap on the expansion tank and see if there is oil/oily residue in there.

__________________
Jim