Welp, here I go again. Parts in or on the way!

So what is the "spot" going to do? The way I see it, they can either they can cut your driveshaft and put on the end from the Jeep or install your factory end and use a conversion u-joint. Dr. Diff sells conversion joints as does RockAuto.com, NAPA and O'reilly's (all on the island).

What "kit" did you buy from Dr. Diff?
OP's putting a Wrangler rear in, which will probably require shortening the prop-shaft, so He wants to just have a Jeep yoke put on at the same time....then He can use a standard Mopar up front & standard Jeep out back...simple really, just the $$$ for the new yoke. I'd use that $$$ personally to buy a couple of hybrid joints to keep around when/if they need changing, but really is 6 of one & 1/2 dozen the other, purely His preference.