Try Doetsh Tech 3000 shocks. They have some valved specifically for your application.
Do a search online they are sold by many online dealers.
If you want to replace the suspension, most lift kits will harshen the ride a bit, even though almost all of them say "better ride than stock". If money is no object, Old Man Emu springs are the best for ride quality. Rubicon Express is also a good name that comes to mind. I had BDS springs on an old YJ I had and they were pretty good as to ride quality, but my stock springs were frozen stiff and not much to compare to.
I would try better shocks first.