The USN is more or less sorted except for the LCS program. It should be a Trump target above and beyond either Air Frorce One or the JSF.
I think the former SECNAV and the Admirals had pretty much firmed up their strategy for LCS and FF. A lot will depend on where the new SECNAV gets his info but being a novice I'd hope he listens to those within his own organization and build on what is already in the works.