Yeah I haven't used the straight or swan neck with their respective extensions, so not sure which one is better but both should work depends on what parts you prefer/can get a hold of and who knows, maybe there is an advantage to having a little bend in the shifter on the non remote shifter setup.
for the LSD, I would go with the TT auto for a street vehicle, they still come up for good prices on here and SF. The aristo one would probably fit just take a look at the pictures and compare. where are you seeing those going for sale on?
if you will be tracking the TRD or the 1.5 way LSD would be nice, there are many threads comparing the 2. The TRD's come up for sale in the classifieds not sure if you will find a new one for reasonable price.