I love everything you've said, I just want to add to that last point - while kindness and patience are radical and powerful tools, and people, allies especially, should try to lead with those, expecting (not that you implied it, just saying) marginalised people to be patient and kind in the face of bigotry is the height of privilege and often slips in to tone policing. People need to understand that anger is a valid reaction and part of the education, and that discomfort is essential to growth.