I didnt mention this earlier, but your comment about shortening the replacement yoke made me think of it. I did cut the output shaft to the minimum Iron rock recomend, then had to cut the yoke to fit.
Maybe that would help on the zj? Not sure if the driveshaft you have would still work.
