I would first go by the screwed up machine shop you have and show them the problem, see what they will do.