Just an opinion - spend some quality time with a file on the side of those teeth before it all goes back together. And as MEK5 said make sure that the collar is in fairly good shape - might make the difference between a good shifting case and a grinder.....
Tom
Tom