Swap the input shaft while your in there.
...or better yet, I bought my t-case (NP231HD) from JB Conversions a few years ago for just under $1100.00 shipped. It uses all new stuff and is out of a 1/2 ton Dodge pickup, which means: HD 32 spline fixed output, six gear planetary (stock Jeep has 3), HD drive chain @1.5" (stock Jeep is 1"), and your choice of input spline. I chose the factory Jeep 23 spline (which you need).
My T-case has performed flawlessly. Check them out. For a few hundred more, you get much more t-case AND you don't have to do the work. You buy it and install it. Done.
-Joe