My CJ5 was not stock, but I did not tinker as much as you did. I was a mechanic then and for some reason, when not in work, I was not much into working on my Jeep unless I had to. That and I was rather fond of the Jeep straight 6 engine, powerful little best for such a small vehicle, did everything I needed to do in the Adirondacks.
One of the reasons I liked the Cherokee sport so much was its size, it was small enough, and powerful enough (straight 6 again) to go anywhere on the tree farm in PA. The other option, my uncles GMC 1 ton with duals could not go many of the places the Jeep could