Only way this get fixed is with #whitelivesmatter.
Force the issue to a point where everyone calls from calm across the board.
As long as we let the PC wing of the world dictate terms to the White Christian Male this will continue.
You have a point. As likely to work as anything else.