I agree with all of what you said, except I don't think that friendship used to be better. Friendship is friendship. Patriarchy influences it, no doubt, but it's not deleting it.
The worst thing I think is using this stereotypes when you're queer. As a non binary person, I would like people to see me as androgyn, or something like that. However, in order to do so, I would need follow the stereotypes of society, and I'm against these stereotypes. This is an awful eternal loop