IMHO,
And as much as I currently support the SH and it's growth potential...
But a typical CVN deployment today, going back 15 yrs and rethinking a strategic long-term approach... should consist of:
1 squadron F-14D follow-on build. (re-engined around 2002-2005 to common ST-21 engine)
1 squadron ST-21 (undergoing it's next increment upgrade)
2 squadron new-build, enhanced F/A-18C+ (post-99, under a should have been, continued production) with earlier builds being sold under FMS, or transferred to USMC to replace older hornets. These legacy hornets would be currently under-going an MLU consisting of mini-CFT integration and RACR-radar replacement.
Plans for transitioning into 5.5 gen + UCAV fleet starting in 2022 would be already well underway.