So how about following to reduce the min maxing aspect of the list. Change the support group upgrades to be following.

Pathfinders: Tetra
Stealth: Gun Drones
Broadsides: Gun Drones
Hammerhead (AMHC instead the current one): Skyray, Swordfish, Networked Drones (Stingrays?)
Scorpionfish: Networked Drones, Supreme Commander (Skyray?)
Stingray: Skyray
Gun Drone Wing: Gun Drones, Heavy Drones
Pathfinder Tetra Group: None
Piranha: None

Edit: Note that AMHC would be removed from Cadres. Also Stealth Upgrade could be dropped entirely to leave them to be proper specialists.

Considering the normal first upgrade for most key formations is a skyray doesn't this essentially give them only one other choice? Not a prob for crisis and tanks, but FW frequently go for upgrades.

_________________
If using E-Bay use this link to support Tac Com!
'Abolish red trousers?! Never! Red trousers are France!' – Eugene Etienne, War Minister, 1913
"Gentlemen, we may not make history tomorrow, but we shall certainly change the geography."
General Plumer, 191x

Well actually Chris you may think that Skyrays are an auto purchase but I rarely field more than one due to cost constraints vs. number of activations in the Tau list.... At 75 points each they aren't a "buy one for each formation" at all