I never had problems with driving a stock Jeep on 31's, but then again, I was used to driving a stock Jeep on 32's. (I still used 5th occasionally, too.) If you're going to 31's, I probably would not do gears. You'd be looking at $800-1500 for the install. If it's not going to be wheeled haed then it won't really be worth it. (more on that alter.) Although you could go to 4.56's and scream. I'd imagine, you might loose some top end but it would be peppy.
If you want a locker and don't plan on upgrading axles then I'd go with a manual locker. OX, ARB, Eaton, Tractech. They all make nice lockers. I wouldn't really recommend these lockers to someone who's still in the process of building, and who might end up swapping axles though. If you're going to have someone install the locker then you'll be paying for about the same amount of labor it takes to do gears on that axle. Basically, when you get gears done, if you want lockers they will install them not no additional labor cost because the carriers have to come out anyway.