Your new plan you already mentioned sounds like a good one. But I just want to clear something up that sounded a little confusing to me. Whether or not you need new gears has nothing to do with the amount of splines your axle has. Yes, the locker, gears, and axle shafts are all connected, but...