It sounds like you may have the shaft for an older model? The steering boxes on the TJs changed at some point, so the mounts changed.
FWIW, I recently had mine all apart. I was about to order new pieces for the same reason you mention, I thought that big OEM carrier bearing was shot. Steering would pop and clunk as you cranked through the range of steering. When I went to order new parts, nobody had OEM pieces in stock (they did have them for older models) and, as the u-joints were fine on my own set, I really didn't want to pay for the high dollar HD parts. I decided that before I spent that kind of money I would take a closer look at that big pillow bushing or whatever that thing is that everyone seems to have trouble with to see if I could just get the steering to hold up long enough for replacement parts to start showing up in stock again. Turns out, I was able to completely disassemble, clean and grease that bearing and it is good as new. Had I known, I would have recorded the process to share with everyone! But I don't have any special tools or skills, and was able to do it. So maybe you don't need the new stuff?
I started out by just trying to work some spray lube into the bearing while I had the steering shaft on the bench and could get at it better. But as I kept working at it, I started figuring out how to get the silly thing apart. Eventually I got into the guts and, and it's core, is a nice set of steel needle bearings. Once I got those and the races they run in all cleaned up, I could see that the bearing was fine - there literally was no significant wear or damage. They were just dried up and full of crud. If I still had the part off the Jeep I would tear it apart again, just to show you all how it works, but all I used was hand tools, WD-40 and paper towels to clean everything because it was cutting all the crud really well, and leaving everything lubricated a bit even after it was clean. There are some seals in the workings of the bearing that I suppose are intended to protect that bearing. I cleaned those all up as well and then I packed everything with a somewhat lightweight, white lithium grease I had on hand. It all went back together just fine and, although I have only driven the Jeep briefly since then (I am in the midst of a big, overall Jeep clean-up / restoration this winter) the steering is working great again. All the clunks and pops are gone.
I wish I had recorded the process for details, but I hope that is helpful.