The front DS uses a CV joint instead of a UJ. So, while it may not *technically* be correct, he is somewhat right.
If I was in the same situation, this is what I'd do.
Scrap the CV joint design, and get a UJ yoke for the front output of the WJ. Then, find a XJ of ZJ front DS and use that in...