This USAF retiree agrees with you, and for the reason you stated.
"G.I." seems to be gaining ground as the favorite here. "surely_you_jest" indicates it is acceptable to a "USAF retiree". Do other the other services, in addition to the army, agree it is a good term for all?