I am thinking, based on the pix. that going SUA again would likly be cheaper/easier than fixin the SOA set up to be correct.
I think that the old owner just welded block on top, got longer shocks and drive shafts, added a drop pitman arm, and just left the rest.
scary stuff for sure.
If it were mine I'd take it back to SUA. and run 3-4" lift and 33's 35's are taxing on the stock axles, and a little out of proportion on a CJ5.
We DO need more pictures to really tell. We have to see how things are attached, what is still left to work with ect.