Rell, I hate to say this but you chose the wrong rifle platform for that build. 85 are notorious for ejection and some feeding problems. A good competent smith should be able to fix the problem or realise it is beyond them and so advise.

9.3X57 is on the nail with the ejection problem with brass hitting the scope. I do not know if this can be rectified. If it can't then the smith should have told you this. I agree with your intended actions.