I would take it to the first guy. The one who screwed it up. And see exactly what he intends to do about it. If he won't make it right, you have little choice except to take it to a good gun smith and chalk it up to experience.
"I need it yesterday" is not something any craftsman, good or bad, likes to hear. 'Course, we all need to have something like that happen before we really learn that lesson.
By the way, how did the rifle shoot with this bubba-ized job done to it?