How about an F35 A2 variant that increases the bomb bay, the air to air missle capacity, and places another engine on the airframe?  I can't assume that doing a "super hornet" type upgrade/redesign wouldn't be a lot cheaper than than reopening the supply line for the F22.  Keep rolling out F35's and upgrade what we have that is working.