I'm resurrecting my '99 A6qa so I can pull the fuel tank on the ury. One of the water pump bolts broke off (thankfully it threaded out) and several others are very corroded - Is there a go-to source for these? Scott Mockry used to help me with such things when he was actively in business. Thanks, Jon