If your buddy's shop isnt a Bosch service center, I'd forget letting him do it. Find a good used one. There's also a 50% chance the pump you have is still good.

I JUST went through all of this. No need for a locking tool (yours likely wont have a slot for it anyway). Do what you said so far, but use the drip method to fine tune it which is simple as hell. Plenty of threads on that, or buy a Haynes or factory manual. Don't worry about the 1 drip per sec. or 1 per 30 sec. thing. Its all BS. Just get it near either and you are good to go. (you are within a 1/2 degree at either and tightening the pump up will change it slightly so there's no getting it perfect, whatever perfect might actually be)

You should list our location in your profile.