The bolt holes on the water pump are through holes, unless they are not tapped all the way, which seems unlikely, there is no way for the bolts to bottom out. I checked both the pulley and the spacer and they seem fine, nothing in the away and flat ends.
Still I would like to upgrade to a...