Also this might be farfetched and a nightmare to code and design so i'm leaving it as just a remote possibility:
Have you considered having separate combat and navigation modes for the character? a toggle button for wing/fight mode switch. It could add variety for each major mechanic but could also increase the ammount of learning the player has to put up with.