Cool, sounds good to me Jane.  I'm also fine with just running around with only Willum and Luna.  In fact, they could be a sort of floating team, meant to reinforce another team in a mission that wouldn't warrant two full teams.  As is, the two could make a very good support team together, because Luna can heal and Willum can adapt himself to any combat role needed.