Trailer is looking good!
I was just wondering though, why wait for a complete 4x4 axle to do the SOA? Don't the axle shafts interchange with the 2wd stuff? If so, why not just flip the axle you have to make a SOA? Which will also raise the pinion in the 3rd member for additional clearance and will aid in minimizing damage to it since it can be used as a spare. Then just swap the shafts if you're looking to make it a 6 lugger.
I don't know if you've considered this, just a thought.