Once you have had bad noises while drive in a straight line, this indicates teeth sheared off and a trashed locker.
Take it all apart have a look.

Of course you are using the OE thrust washers, between the case and the side gear?

SD