SAS it. It's probably not too out of your price range if you are planning on spending $9k any way.

This will solve the lift problem, locker problem, tire problem and weak front diff problem all at once.

It will also fix your VDC problem as it won't be there any more.

Or, go the route I just took and find a nice used Rubicon for a bit more than you want to spend modding the X and use it as the trail rig.