I ordered a shaft from a specialist over here, was surprised they even listed Jeep ones, & the price was very attractive. As I was warned it was CVJ one but at least now I know it'll fit. Then maybe I can fit new U/J's at my leisure (only found out replacements were available AFTER I'd ordered the shaft).
Meanwhile it got through annual safety check, which I didn't think it would & that was real reason for rushing into a purchase without proper research.