I agree with your points, but I see a lot of overlap between social functioning (masculine & feminine) and gender roles. Back in the early 90s in sociology, we spoke of “gender expression”. Biological sex was binary. Sexual preferences (Kinsey) and gender expression (Camille Paglia) were more flexible. Indeed, social markers of male & female expression have shifted across time and cultures.