Switching would be awesome some day. Pick which NP your servant goes to battles with in their Card, like you do with costumes.
But it'd mean a big overhaul, alas...
Edit:
Also it just occurred to me that not one of Ushi's five NPs was her horse. Touche.