Need to replace front driveshaft

My XJ has a 3.5" Warn Black Diamond lift installed. I have the Renault 2.5 ltr engine, Chrysler 904 transmission, NP 207 transfer case and the front driveshaft has the cv joint at the case. I want to replace it with a driveshaft that has universal joints at both ends what can I put in and what transfer case yoke would fit?

The only thing I could find is this post saying the 207 and 231 front outputs will interchange. I don't think I would trust it though. You have the 207 there, can you pull the output and count the splines?