Glad to see that someone else remembers the old days.
My 86 was like yours, too much to list, but added a built 350 sbc, custom headers, solid rear axels, 370 gears, 3" lift, skid plates, diamond plate body panels (to hide the rusty areas) and I still have it. 240,000 miles and still will do 120mph on the highway.
My moto was if something broke it wont break again
The plates read GTNMUDY
Hope you find another CJ soon. Life is to short to just stay on the roads....