Hussar
Legend
There's more to the problem though. It's not like Nightcrawler is a black skinned sadomasochist who hates and enslaves all men. It's not just the color issue here. The entire race is very problematic. And trying to point to mythological origins doesn't work either because, while drow might look something like svartalfar, the whole femdom dominatrix thing is going to piss off pretty much everyone.
To be honest, I'm actually pretty shocked that drow have managed to stay in the game as long as they have. Even a cursory glance paints an incredibly bigoted picture. Hrm, man hating women who worship a black widow spider demon. Yeah, that's not going to trigger anyone at all. Then plaster in the color thing - good elves are white and evil elves are black - and you're just begging for a spanking.