Just a quick update. It's running like a champ now.
I rechecked that I was at TDC, reinstalled the distributor EXACTLY according to the FSM and it fired up perfectly and purrs like a kitten.
I can't tell you what the exact fix was, but I can only assume that I must have been a tooth off on the distributor or something.
Anyway, I now know more than I ever wanted to know about my 4.0L swap, distributor issues, and the wiring. I guess it's a good thing, but my brain is FULL!
Good luck to the rest of you on your swaps!
85 CJ-7, 4.0L, twin stick/clocked flat Dana 300, SOA, 36" TSL's, 30/44 locked, Warn X8000i
92 XJ, 4.0L, AW4, Dropped NP231, 30/8.25, 4" DPG Hybrid lift, 33" MT/R's, JKS trackbar, JKS discos, OME Nitro Shocks, stinger bumper, Warn X8000i, etc. (work in progress)