I can't help with your exact answer, with part numbers and all, but I know when I did my YJ I had to buy two or three different packages because there was no perfect kit with all 12 bolts worth of bushings exactly the right size. I decided to go with Energy Suspension, so went to their site to look at bushing sizes and packages. I was able to almost get there. I ended up with two bolts worth (4 pieces) of the small size upper shackle bushings on the shelf. I've since used two of those pieces for other non-suspension things.