Since you mention ride quality is important to you, and it is to me too for my daily driver TJ, I'd say to be real careful with your shock selection. Shocks to avoid are quite a few... ProComp ES-3000, Rancho R5000, Skyjacker Nitrocharged, and actually most other nitro (gas) charged shocks as all of them ride stiffly.
The two gas-charged shocks I'm aware of that DO have a good ride is the OME (Old Man Emu) and the SPECIAL Bilstein 5100 made specifically for the Wrangler... which not all Bilstein dealers even know about so be careful there.
Other good riding shocks include the Doestch Tech DT-3000, Rubicon Express's monotube Extreme", and hydraulic shocks like from Skyjacker, etc.. Both the Rancho R9000 and ProComp MX-6 are adjustable so you can dial in the ride you like but both must be adjusted all the way down to their first or second settings for a good ride as they are not specifically valved for the Wrangler's weight.
Do get some good control arms. I'd class both ProComp's and Tera's on the same crappy unacceptable level. Rubicon Express, Currie, Full Traction, JKS, etc. make good control arms.
