The vast majority of modern societies where male/male non-sexual affection is considered normal are incredibly intolerant of homosexuality

Yes, but within each society ISTM that the individuals who display less affection towards members of the same sex tend to be the more homophobic ones (possibly because homophobes don't want to be seen as showing more same-sex affection than the typical person in their own society).