I've been discriminated myself for other reasons. I am an Aspie. And today you may no longer say that I'm "handicapped"... no you must say that I'm "impaired"... Which just means "handicapped" so I wonder what the difference is.
Now I'm Dutch and in Dutch we have the same discussion.... Is it "gekleurd mens" (lit. Colored human) or "mens men een kleur" (lit. Human with a color)? And when it comes to my own issue it is "gehandicapt" (handicapped) or "beperkt" (impaired)?
The issue is that changing the term won't solve the issue itself... Those words and terms only sound discriminating because they refer to a target group of discrimination. I think all languages have this discussion going on... I mean it's also nice and cool that people no longer say "Indian" but "Native American", but did that make the situation for the Native Americans or Indians or whatever you wanna call them any better or worse?
And in my humble opinion, having the discussion about these issues with nonsensical argumentation won't do things good. In fact, I think it will make it worse. Sooner or later the entire discussion cannot be taken seriously anymore and the people who are target of whatever form of true discrimination will pay the price.
But then again, discrimination is not the only issue were nonsense rules over sense. Sad, eh?