I don't think the second case can fit homosexuality. If homosexuality-promoting alleles are losing ground to mutations that do better, why haven't they completely vanished yet? It's unlikely that going back, homosexuality rates were far higher; that would make prehistorical men very unusual among other mammals.