I am firmly of the belief that most of the tension in the fediverse that flares up would be adaquetely mitigated by giving users fine control over what they do and don't want to see.  The rest will hopefully sort itself out as social groups adapt, some people listen to each other, and you know you don't have to put up with anything you don't want to.

The wall around Mastodon will probably help too.