something to be sure of when rebuilding the gear area is to make there isn't any slop in the system so the gear locks in firmly, I did the same basic thing when I ripped my gear out, after I rebuilt the area it was too loose, and the gear wouldn't stay locked in, had to tear it apart, and rebuild it again so it worked properly.

I just used the gear leg as a spacer it worked like a charm.