I agree with what you wrote here and in the linked article except for your solution. My comment stands. I know that gender and sex are different. So your answer is male individual/person and female individual/person replacing the terms man and woman because of societal constructs as if that will solve the problem and people won't assign the same constructs to male and female. In this case, the labels are not the problem. The thinking is.

What do you say to a female who wants to be referred to as a woman? Are you gonna mansplain to her that she is wrong?