I have recently replaced my water pump along with all the belts. I attempted to just remove the pump itself but all the 6mm bolts decided to break off, even the two which hold the thermostat housing. Because of this, I had to remove the entire pump body and replace it. Dealer reman pumps come this way. This was a tremendous job requiring the removal of the A/C and the injection pump. To prevent this from happening again, I removed the steel bolts from the new pump and replaced them with 316 stainless steel 6mm X 20mm. These were about $7 and also fit the thermostat housing. Cheap insurance for the future. The water pump and thermostat on these cars are mounted rather low and will collect road salt at both ends since the bolts are not in blind holes. A good source for all types of metric bolts is Mcmaster.com; these are part number 93635A212. I try to replace all non-hardered fasteners with stainless.
Daniel