new street ride suspension?

[gortsnooter]

I have tried two suspension replacements, one NOS and the other Monroe in my '79 CJ with 2" lift. Both rode way too stiff for my wife (and myself). Shakles are correct. Removed the middle leak (Monroe) of the 5 leafs and it improved. What is the best suspension replacement, (Leaf springs and shocks, 2" lift), for a street only ride? This CJ will never go off-road.