Eternal Alliance: Companion Roles

With the Outlander currently still heading the Alliance, and having recruited almost every single companion, the Eternal Alliance is currently still very strong. In my canon, each of the original story's companions fulfill the following roles in the Alliance. Keep in mind this only takes into account classic companions. No force users are considered either as they can basically fulfill almost any of these roles. I know it's not possible to recruit all the below, but I like to think that each of the original companions are helping the Alliance in one manner or another. What do you guys think?

Alliance Intelligence
Major Malavai Quinn (Watcher)
Lieutenant Raina Temple (Cipher)
Lieutenant Talos Drellik (Fixer)
Doctor Archiban Kimble (Fixer)
Doctor Eckard Lokin (Fixer)
Tharan Cedrax (eventually as Minder)

Alliance Havoc Squad
Major Aric Jorgan (Commander)
Major Pierce (2nd in Command)
Captain Elara Dorne (Medic)
Captain Yunn (Specialist)
Provost Marshal Fideltan Rusk (Shock)
Forex (Heavy)

Alliance Bounty Hunters
Quyzen Fess (Solo)
Treek
Blizz
Mako
Akaavi Sparr
Chief Torian Cadera

Alliance Infiltrators
Kaliyo Djannis
HK-51
T7-01
Zenith (eventually)

Alliance Space Raiders
Andronikos Revel (Captain/Pilot)
Vette (Co-Pilot)
Risha Drayen (Navigator)
Corso Riggs (Gunner)
Gault Renaow (Gunner)
Guss Tano (Just There)

Alliance Commander Bodyguards (Capable of Taking on Anyone 1 vs 1)
Khem Val
Bowdaar
Broonmark
Skadge

Alliance Diplomacy
Vector

Reserve
Lieutenant Felix Iresso

If we include the KOTFE and KOTET companions:
Major Anri is part of Alliance Havoc (if Empire is Chosen)
Theron Shan is Keeper
Lana Beniko is Minister of Intelligence
HK-55 is also an Infiltrator
Nico Okarr takes over as Pilot of Alliance Raiders
Paxton Rall is also part of the Raiders
Ak'Ghal Usar is also a Bodyguard
Rokuus is a Bodyguard
Shae Vizla is a Bounty Hunter
“Deadeye” Leyta is a Bounty Hunter
K’krohl is a Bounty Hunter
Hemdil Tre is part of the Reserve