Designing around riflemen is bad design at the beginning. There are too many combo in game that you simply can't deal with them with rifles only. Not to mention riflemen after several nerf is one of the most cost ineffective infantry to build. Now, everyone is try to avoid it with commander. Having officer that come with tech is a weakness instead of advantage since it decrease your flexibility to access to other useful stuffs.
Could rework the officers to be a squad upgrade that opens up new options.
Lieutenant gives smoke and sprint
Captain could have some targeted abilities like other officers have to make him a force multiplier
Major maintains the "doctrinal" type abilities it has now.
Limit of 1 each, takes up a weapon slot and grants a Thompson+ small target size reduction.
Spitballing here.