The JSF project seems to have been a disaster for a long time, see AW&ST. Redesigning F-22 for use from aircraft carriers is unlikely to result in a useful aircraft. So limiting the project to F-35A and -C and giving the Marines another aircraft is probably the best solution. My favorite is not really something derived from Super-Tucano but a well designed Westland Wyvern look alike, now with a good fuel system ( The 127 aircraft built killed 13 pilots, mostly by the engine cutting out when catapulted ). You can use two engines driving co-axial propellers, thus giving the aircraft a huge range at modest speed.