Honestly, I recommend having 2 different modes, 1 for each.Both ideas sound great to me, and I would love to see both of them in the game!
If this isn't what you want the game to be, though, then that's fine.