This is where I think the debate in a lot of the terminology is, cause I've read what you posted here in many places, but have also read different definitions in different places, all sorts of differing interpretations by this PhD or that PhD.
It seems to me that there is no "true" commonly associated way to handle the change with culture. I mean, some word has to mean masculine for feminine, and traditionally, at least as traditionally as the topic we're discussing, gender was masculine or feminine and linked to those social roles. and male or female was reserved for "in or out"
I find it interesting and often think of where the words will fall into what circle, but as much as it's being said people are confusing one for the other, it seems the other side keeps using gender, and sex words, to mean both.