More options could be opened here for units with more than one ranged/melee attacks.
Maybe an in game option where the player can tell the unit to automatically use an ability? A ranged and melee should be set in the xml, I not both ranged and melee should be merged.
So when the player chooses an attack, there should be a way to set that attack as the auto attack or the auto ranged/melee attack if a unit has separate ranged and melee moves. Maybe a cool overlay frame could be added to that attack's button when it is an active auto attack?