I would improve a bit more the concept behind the character switch. I don't know if it's part of the game design but you can increase the chance to win the game by using your buddy as shield.
The tutorial at the beginning should help against the confusion about when the characters switch. What do you mean with “it” concerning the game design?
