Don't remember if I mentioned this earlier, but how about a F-104J-Kai, equivalent to a F-104ASA but with Japanese radar and, depending on timeframe, AAM-1 and AAM-2 missiles or AAM-3 and AAM-4 missiles - in each case, the first is a Sidewinder replacement and the second is a Sparrow or AMRAAM replacememt.