Your problem is most likely just a couple of worn syncros. I would buy a Quaife diff, have a transmission shop fix all the syncro issues and install the diff.