While they don't need to be upgraded, LS-6s would certainly add a useful capability along with MERs. F-7PGs should stay till 2025-30 to help with minting new pilots and having something to get some flying hours on. They are dirt cheap with very low cost and easily accessible spares.