Just a thought for simplification and consistency.
Make the bow armed version half long spear exp bow with shoot and shield cover half bow as they used to be with the NOTE: Long spear may only fight in one rank. This seems to fit with various other troops who have a note that they can only shoot in one rank for example.