With 31" tires I would look at a 4.8:1 transfer-case. That should put you right back to stock gearing. If you just want to lift, both sell quality hardware. I like the Sky Manufacturing Stage 2 SPOA lift myself as the best bang for your buck, but it does require welding.
What do you plan on using the Samurai for?