@benroyce I think you might end up with 2 different aspects:
1. Objective rules, to make tolerance possible.
2. Personal (dis)preference, to protect yourself as an individual.
It is interesting though. It makes me wonder if we should deconstruct 'tolerance' in core concepts (constituents?) that need to be solved separately.
I think I need to sleep on this. Might come back to this later. You have the right goal in mind, in my opinion, but 'tolerance' is a curious term in itself.