Seems to me currently there are just too many pilots as heroes, resulting in multiple squadrons of the same squadron in some cases.
Solution: Instead, go by squadron and era.
So for example, instead of Wedge and Tycho, you get Rogue Squadron with BOTH of them.
It'd require a little reaming and reworking, but would clear up the hero clutter some.