How about having two types of elites, one from race and another from personality?

So for eg. you get Beastmaster for choosing faery but you have, say, Assassin elite for choosing rogue personality.