My suggestion would just be to add a dedicated button that toggle between ranged and melee if you can fit it in without making the UI too cluttered. Perhaps next to the context action button. That seems to me the way to go.