You have no idea how much I want to say you suck because I am so jealous of your workspace! I have done so many rebuilds in such cramped quarters that I never really gave it any thought until I looked at your pics. And then I had to look again at the CJ and I turned even greener... OK I'm giving you heat I admit it, not to be mean, but to let you know That I, like many of us REALLY appreciate what you have there! And the engine, Its the one Chrysler screwed up on, changing it for the 4.0... Had one in my 76 Cherokee S that acted like an 8 but drank like a big 4. If money isn't an overly major issue, and neither is being bone stock there is a lot you can do with that mill to increase torque and decrease fuel consumption, one of which is electronic fuel injection, which is a godsend over the carb. Someone suggested Quadratrac. Don't. I have it. its a fuel guzzler, look for a select-trac setup. It offers the same ability as Quadratrac plus more. first off it is normally 2wd not fill time 4wd ONLY like the quadratrac. It can be set into a 4wd mode identical to the quadratrac, a locked offroad 4wd mode locking front and read drive shafts together as well as a low range setting of this mode. the first 4wd (quadratrac) mode has a viscous clutch between the front and read drive shafts splitting torque, allowing for driving on road or off, even on dry pavement. Its ideal for foul weather especially snow. but for a smaller jeep, on dry roads or even just average wet roads, the extra drive line engaged just sucks more fuel. The select-trac having 2wd removes this issue.
BTW I have the quadratrac in a 94 GC and the select in a 98, the 94 is a 5.2 and the 98 is a 4.0 on the bottom end from a dead stop the 98 in 2wd is ALMOST equal to the 94 up to about the 3 grand mark then the advantage of the 8 shows up. So the quadratrac does suck up a fair amount of performance due to the extra drive line that's engaged and driven