It's not about my comfort, I am comfortable with most anything and anyone. But I am not in the business of legislating what others have to be comfortable with under force of law.
Its mostly moral law anyhow (please no babykiller arguments currently).
So that Mrs Smith doesnt get to the bakery one day and pronounces, that she should get to skip place in line, because the husband of Mrs Notsmith turned out gay --
or that Mr Alan Turing had to be 'chemically neutered' and shunned for winning the US WW2 and bringing you personal computing.
That was one of virtues of western societies at one point (and yes, not the 19th century, but come on...). That stuff gets 'a little more publicised these days' may have to do with everyones 15 minutes of fame on social media (most people still try to avoid).
And stuff like rather hefty changes in language arent mainstream by a long shot.
Minimize the aggressive rhetoric against people 'profiting off of being morally apprehensive' (in your view) - because outside of the SJW subset of people that tried hardest to find a really stupid set of rules to declare who is better that the other person, this still is not how society works. Try to not judge people based on really mostly kinks or race - and you are far less problematic in terms of your believes.
And if you dont believe in socially apprehending people with those attributes anyhow - also change your rhetoric in that regard. Just so people dont get mad thinking you are something that by your own account you are not.
I mostly get the impression that you think people with those attributes get along better in life, but that still should be more or less coincidental. In no version of the world I parttake in does virtue signaling count as first and formost 'promoting' the thing you are championing - for wide use - either. You are promoting your oh so liberal attitude towards it. And that by virtue of the fact that you draw more attention towards that thing - some people looking for attention get more drawn to it -- still doesnt get you - or them, anywhere 'in life'.
Allow for 'private space' where you dont legislate into. Acknowledge, that some of it will swap over into the public real once in a while, and dont hate on that so much rhetorically, if you can help it. Also helps with the tentative selfloathing.