The Waggy axles are a real good fit for a YJ! Be aware that some years run a AMC20 rear, and also a disconnect front D44. Neither are exactly deal killers, but price should reflect those issues, as they aren't as desirable. The front is a little weaker/problematic, and the rear is a little harder to get parts for and has less ground clearance.

This is shaping up to be a great project!