My thoughts...
Aside from fuel injection, leave it alone. If you want a better riding/performing suspension, fine, but don't hack up what looks to be a clean CJ. There are plenty of YJs and TJs to hack up (and S10 Truggys).
If it's not as clean as it appears, do what you want. Looks like a fun...