I ended up using Arizona Rifle Works. Jason is the owner/machinist. Works out of his home garage, so an appointment is needed. Finished it in a couple days, which was before he promised it. Work looks good, and the price was reasonable.