I have the new parts designed and on order. Might be a week or so before I have them in my hand for test fitting. I'm pretty sure this new design will solve the problem.