Thanks for not giving up, I ran out of time to include a lot of my ideas for the game. The idea for Em was that she would do quests with the NPC characters.
As for waiting for Warrior to charge back up Em can pickup skeleton remains and cut down wait time when pressing [c] key on a dead skeleton bones.