Well, one idea (which I believed was used with for example some Hoplites in later versions of EBI) is to simply not give them a secondary weapon. Obviously though this isn´t the perfect solution, and I sincerely hope and believe that the great EB team will satisfactory solve this problem.
If not, well, that´s quite alright.