I have been thinking about the ace problem we kind of have here, I think I have come up with a possible solution. Give every generic squadron an upgrade bar, and enough upgrade options and slots to make any generic as good or better than any ace you could get. The balance to keep the aces relevant would be effectively pre-built bundles with defense tokens.
To give an example for 7 more points per squad you could give every generic X-Wing a black die instead of red for their bomber roll. Thi