Have you pulled your sway bar? I am not encouraging you to go one route or the other... I found when I pulled my sway bar, the ride got quite a bit better. There are also a few fine tuning things that you can do to your jeep such as:
Shocks. The DT 3000's are good. My preference is the the Sky Jackers.
Tire pressure. Most tires are are rated for a vehicle significantly heavier than what your jeep weighs. There is a fine balance to comfort/safety and having sidewalls that are stiff as a brick. Be careful not to deflate them too much (a la Firestone in the late 90's) There is a chalk test that you can do to check to see if you are over/under inflated. The quick version goes something like jack up the jeep, smear chalk on tire, lower jack, move vehicle forward and back (in driveway), raise vehicle again, inspect wear pattern. If the middle of the chalk is gone, it is over inflated. If the chalk at the outside is gone, then it is under inflated.