I have the same issue, did you find a solution?
I just requested a quote from an online custom gear manufacturer. I am thinking a delrin gear with a thicker shaft collar would be a big improvement. I will update if I get a solution. and may have some to sell if I get it to work.