Howdy Pard:
I have had excellent results from Cimarron customer service. They have a smith there in town and he was concerned, responsive, knowledgeable, and friendly.
Give them a try and they should take care of you.
PS
I shoot there with every rifle!