The stock waggy stuff is plenty HD if you ask me, having run it 4+ yrs on two different SAS nissans on a lot of hard stuff I think its beefy enough for me. As is it sits above the axle enough that I don't recall contacting it on the rocks much if at all.

Be that as it is, I think it’s a good upgrade to at least change the draglink because the CALMINI adapter is PITA for alignments because of the threading.

Since you already have an ES2026R tierod from CALMINI that goes on top of the pitman couldn’t just leave that as is and then use the ES2027L on the DL connector? This way your angle will be almost the same as it is now and you don’t need to ream the pitmam, which is no big deal but I might try it with the parts you have to see how you like it first.