FWIW, my 97 V8 came with a front u-joint style driveshaft from the factory. Don't dismiss any "2nd gen" ZJs in junk yards just because you think they won't be right. Take a look. One of them just might have what you're looking for.
And Polka, that's exactly what I did when my front pinion seal started leaking. I counted the number of threads after the nut before I took it all apart then counted again after while I was tightening. I marked on the pinion where to count from and got about an extra thread out of it. That was 2 years and 15k miles ago. It's still going good. I also bought a new yoke in fear of mine being scored and damaging a new seal.
97 ZJ - 5.2/242, 4" lift, 31s, locked, armored
14 JKU Sport S - Stock