Well at least you got it figured out so when it happens to me I'll know what I'm dealing with.
For your 14 bolt swap you may want to consider a swap kit from Barnes, or fab one up like it. The perches and top plates are predrilled for scooting the axle forwards or backwards. Might save you from having to make a new driveshaft for the axle snout difference.
https://www.barnes4wd.com/14-Bolt-Ax...mbo_p_127.html