Maybe spend a little time experimenting with the Toe? I have not had a need to mess with it much myself, but a few previous posters have indicated that their steering issues were corrected by going slightly more Toe-Out than the factory spec. (I also have not seen any follow-up reports posted that talked about any longer-tern effects, like the possibility of increased tire wear...)

At least it's something free to look at before dropping money on more Caster corrections. Corrections that you have no idea whether they will actually fix your issue.

 

Dirtman is correct but when you do what he stated you also alter the camber while correcting for caster as you rotate the offset around in the BJ mounting hole. So you correct for one and create another issue but it is a small affect IMO. Like he said though 0.25* caster difference is minor. Also get the alignment shop to measure the x-distance from LF --> RR and RF --> LR to check the distances from center to center. Results might surprise you. This is called chassis blueprinting like what is done to extreme performance engines making all measurements/clearances equal and to spec. One of the easiest things to do is have the Jeep on a perfectly level surface (concrete parking lot or similar) then disconnect one side sway bar link at front and rear bars. If there is a difference in height when disconnected then get an adjustable link and make it so it slips on with no prying up or down.