Arizona FABO Members Local Shows & Events Interest
It's possible that the reason the bolts seem too long is because the brackets that went between the bolt heads and water pump housing are not on there.
Did that once myself, and when I cut the bolt shorter I realized that a bracket went there and then the bolt was short.
Luckily I had extras.