what I have been doing as a work around is editing the FO and FO vehical formation (since all FO units have officer )so there is 2 , then buy and move one into the Company HQ formation ,, that gives the Company HQ a 2nd officer ,, then just change the unit to the type needed for the company . You loose a little exparince that way but then executive officers are there to learn anyway
. I think it would work with helicopter unit also but then you would either have understrength unit or have to delete it next turn.