High Tier USN DD Captain 3rd Skill

I am wondering if I should take Vigilance in place of Superintendent. I have my Farragut specced with SI, but I plan to take my current Mahan captain up to Benson.

Up to now, I have never actually used Vigilance so I have no experience in a ship with its effects. I am also not sure of how the upcoming changes to IJN torpedoes will affect USN DDs. If I play as a screen, I think that Vigilance might have better value.

I plan to go with this build:

• SA
• LS
• 3^rd skill here
• DE
• CE
• BFT
• TAE

Any idea?

#TL;DR: Vigilance or SI