It's far simpler to swap the trans input gear to 23 spline, but if both have the same trans and tcase, then swap both together for simplicity and change the externals so they mate. The other option is a different tcase. I am going to double check what I am going to say next. Do you need an upgraded case anyways? With a 7/8" thick clocking ring as a spacer (I found one cheap) you can put a NP208J (from some '80 to '88 full size Jeeps which is 23 spline) behind the AX-15 or AW4 23 spline ('91 up) and have a VERY strong setup with non slipyoke stock.
They also use a NP219 ('80-early '82), NP229 (mid '82 to '91), NP228 (used '86ish. Same as NP229, but no viscous aka "posi" coupler) and for real grins and giggles, if you are seriously going offroad with it, the NV241OR from an '03 Rubicon (or aftermarket from jbconversions.com ) gives you the non-slipyoke with 4:1 low range stock and they were originally designed for diesels so they have strength.