What is your location. Someone here might have a suggestion of somebody close to you. Right now my gunsmith is busier than a one legged man at a ass kicking contest. Three men working full time and their back log, for even simple stuff, is four months. A restock is more like early Winter or next Spring. That is not a line you want to get into without asking. And because they are so busy they are turning work away or perhaps better to say they are not fooling with some jobs and some people. Lucky for me I am down to the last three minor repairs and my entire collection of tomato stake will be up to snuff.