I'd personally like to see the restriction on Shadow Shift be like Drow or figures that follow Utgar or something themey. 'Common figure' could work since you could at least squint and see some theme there. 'Not a Unique Hero' is too gamey for me, it's just there to exclude Raelin and doesn't have any thematic bite to it IMO.
So
as the design currently stands.