I'd look at a combination of longer shackles, slight body lift, and the TJ flares. I'd remove the track bars (frame to axle rod), add disconnects to the front sway bar, replace shocks, steering stabilizerk, and check the brakes, steering, ds and axle joints.