Our opinions are both valid, but it is apparent that our core beliefs differ. While I agree that there are societies and organizations that embrace diversity, I strongly believe that itself to be a deviance, not the norm. "Classic" societies, orgs and memeplexes are almost all xenotoxic and value homogenity. Yes, even most flavours of buddhism.

yes, but you said > intolerance to any deviation is inherent to any society or organization.

While I agree that there is a certain amount of homogenity inherent to any grouping (after all, a group has to have something in common to be a group), I don't think that implies that it must be intolerant to deviation.

Historically, I'd agree that societies, etc have been more homogenous, but I don't agree that it is an inherent quality.

If I were to argue my point deeper, I'd say that these societies (orgs) that embrace diversity both are very recent or very recently exerted a significant effort to be more tolerant due to very pressing issues. Otherwise our monkey brains are wired to think "other/them = bad, same/us = good". Groups amplify monkey brain, because monkey brain gets us in groups so that leopards don't kill us at night. Hence the inherence and need for significant effory to override instinct.