While Ron checks your credit rating - here is what is probably the top of the line in the replacement detail sets
L'Arsenal's twin 40
L'Arsenal's 5"/38 single
L'Arsenal's Mk37 director.
L'Arsenal also makes quad 40s, 20mm Orelikons, Mk51 directos and other details. They are likely the best available. Jacques Druel of L'Arsenal has indicated that he may package a Fletcher refit set.
Toms Modelworks, Gold Medal Models, Flagship Models and Eduard all offer aftermarket PE sets. The Eduard is for the Tamiya (unless they are bringing a new set) so discard that set. Of the remaining three, I think I'd recommend the GMM as the most comprehensive.
Tom Harrison of Toms has worked with Trumpeter in the past, and as a result he has gotten early preview samples. Tom has reworked his old Fletcher set for the Tamiya into some new items for the Trump. It might not be a bad way to go.
Rusty White of Flagship has not indicated if he is going to update his set. It is a good set to begin with.
Yankee Modeworks has also indicated that they may be considering a refit package of parts from their resin USS Johnston kit, probably not to include the PE fret.