Surely the solution is obvious and keeps all defence experts happy

F35a dies:
USAF sells its ‘old’ Raptors to Japan and Australia
Fortune spent re-opening Raptor prouction line and USAF gets original 700+ number of Raptors all with JSF electronics instead

USArmy gets the CAS mission but USAF gets a couple of squadrons of B1Rs to drop JDAMs from altitude

F35b and F35c are safe as they are the most expensive variants