Crusader replacing Starfighter export sales

As you all know the F-104 Starfighter sold very well in export sales to US allies. But this jet did nothing more than fly fast supersonically. It lacked maneuverability, range and payload. However in Vietnam it was learned that Mig-15/17/19 could cause a lot of embarrassment to the F-4, a fighter that were believed to outclass any enemy, and the F-105 Thunderchief, which was believed to be an un-touchable low-level/high-speed strike fighter turned out to be easy meat also. However the F-8 Crusader earned the name “Mig Master” and proved to be a capable figher. So do you agree that it was a mistake to ever use the F-104 as a fighter and what would have been a good replacement for it for export sales. I think the obvious choice is the F-8. The Grumman Tiger is a possibility. The Delta Dart has serious aerodynamic problems which caused frontal redesign and I doubt it would have been very maneuverable.