I have to say if the tub and other YJ parts will fit the CJ I'd go that route so the drive train won't have to be touched. I just did a 4.3 V6 swap with an Ax-15 in mine. For the people saying it's better to just buy one with a 6 in it already because it's too much work...it really isn't. Yes you do have to remove the 4 cyl mounts and get new ones welded on, mod the skid for the new tranny and shorten the rear drive shaft. Other than that it's just wiring the new computer and harness to your Jeep. If you have all the parts and tools to do it you can get it done in just a few weekends.
l We're here for a good time. Not a long time. So have a good time the sun can't shine every day.