There should be job (MOS or Unit) based standards. The three physical fitness standards should be:
Combat (Infantry, Artillery, Armor, & Special Forces)
Combat Support (Engineer, Intelligence, MP, etc)
Support (Logistics, clerical etc)
And under Combat - Armored Cavalry!