HOLD IT!!!
Why are you swapping boxes? Are you changing from push / pull to crossover steering? "Yes" is the only reason to be using the 2wd box or shaft. All the major crossover kits use a pitman arm that is splined all the way around requiring the large nut on the bottom just like the orignal 2wd set up, there is no need for the nothed / pinch bolt set up.
As far as the retention method for each arm DO NOT improvise and grind a notch into the 2wd shaft!