What ever you consider to lift your Sami, you will be best to add some ds spacers and longer shocks to maximize your droop. Best overall for your money is to run expandable shackles front/rear, relocate rear springs forward, run CJ rear springs rear, exp. shackles, longer shocks (relocate rear shocks), add spacers, and you should have the room for 30s, plus 2 - 3 times the droop.
Simple and easiest to do is a shackle and shocks. By adding longer shackles, you'll be 1/2ing the difference in height, ie. 1" longer shackle provides 1/2" lift. Not to provide a significant in lift to take out geometry, you need to keep the shackle lift minimum to 2" shackle. Add longer shocks to compensate for better travel. That should be well enough. You may also have to relocate the brake lines for better droop.
Next, I'd suggest that you look into adding front and rear attachment points to the frame. Seems you like a little muddy trail, but without proper hooks to get pulled from either direction, you'll be pulling off parts trying to get it out.