<sigh>
The factory LSD is a full carrier, so you'll get to do at least a partial gear set up. I'd consider new bearings and seals while you're in there. Based on your post, I'd suggest that you find someone to make the swap for you as you'll need a press and a good dial indicator to get it set right.
As far as locker vs. LSD, that's more personal preference. Lockers are NOT for everyone.