1mana monsters

Agreed.
However, I'm clueless as to what unless you want to nerf gen'd tokens like how Fairy Circle works (which I'm pretty sure you don't as it's no better than the "if not a token" solution).

If worse comes to worse, we can just make the tokens = the actual cards for now (Mubble is already that way) and save trying to distinguish the card from its token for the next expansion.