Well I guess you are right that simply making gender./race/etc. a matter of self expression rather then solely based on what you happen to be born as isn't going to really make the problem go away. I mean, people are prejudice on things like what clothing you ware or what shows you like too. Maybe the only way to fix the problem really is just to alter how human brains work. Maybe it should be seen as a mental illness and "cured". That seems like a bad road to start down though.
Not sure what you are talking about in "don't fuel the opinion" though.