Well, as a pro, I would recommend that you have a pro do the complete job. With either of these shops doing the work, you can rest assured that it will be done promptly and to industry standards. Neither of them are going to stick bubble gum in the hole and call it a repair.
As I don't know the capacity of your mechanical ability or experience with safe locks, I would highly recommend you let them recover/change the combination for you. There are mechanical maladies with older safe locks that you may not be aware of. The failure to diagnose one or more of these can result in significantly more money making a hasty exit from your wallet. If one of these shops changes/recovers the combination for you, they will feel and see these.
You're not only paying for the combination, you are paying for a professional to put his hands on it. Just as a doctor can place his hands on your abdomen and diagnose, so can we by twisting the dial. To be honest, we can't help but do it. :-)
It's a couple of bucks more, but it's the safe play Jon. You will spend the money only once.
Tony Fiorini CRL