If it were my money…..
A lot would again depend upon how hard you wheel and how long before you expect to make the move up to wider axles. Axle work is expensive and I would not spend a lot of money on a CJ AMC 20 (FSJ 20 is a different matter) unless you plan to keep it for a while and then only within limits. I ran an AMC 20 with one piece shafts and a Lockright lunchbox locker for some time with no problems but I am not a hardcore push it until it breaks kind of guy, anymore. There was a day that I thought 4x4 meant go fast just in 4 wheel drive and basically destroyed a brand new CJ5 in about 6 months’ time but I chalk that up to the insanity of youth.
If the plan is to trading out the axels in the next year(ish) I might start looking for axles now. If lucky you might come up with a 1986 CJ7 with a Dana 44 rear being parted out. A tall order but is amazes (and saddens) me as to how many CJs are being parted out by private parties these days to pick up a few bucks. Should you decide wide track isn’t required there are a lot more options that become available.