I just went through the same thing and ended up getting the Iron Man Stage 2 nitro gas shocks and air bag delete kit along with the control arms. I am extremely happy with it and do more towing than off road exploring, and use it as a daily driver. Couldn't wait to get rid of my warn out air...
My fun car, 1988 Scirocco, engine swap, MK4 TDi tranny, LSD front diff, Garrett GT30R turbo, lots of other stuffs. 370HP on the dyno
Daily Driver, 3" Rustys off road lift, wheels, tires, headers, some other stuffs.