Another of our members pointed out that the sector shaft (the part the shifter is connected to) does not have a true Neutral.
When the T-case is in Neutral, it's actually in 4WD (the front shaft will turn), It's just not connected to the transmission.
But one from TJ does have a true Neutral, try to find that too. There is a link on this forum somewhere.
Really only an issue if you're flat towing it. But since you're there...
Wish I had known about it when I did my SYE.
As far as a rebuild kit is concerned the only suggestion I can make is get it from a reputable supplier. (Made in USA)
Check some of the gear supply sites. (Currie, ECGS, Dynatrac, etc.)
Probably cost more, but if you're like me, you only want to do this once.
I didn't rebuild mine when I did the SYE, probably should have, but I had time pressure.