I feel this so strongly. I don’t think there is “femininity” and “masculinity” in finite terms. It’s a spectrum.
Women can fall more on the masculine side and men more on the feminine.
Women can be hyper feminine and men hyper masculine.
What we really need to do is take the social stigma and charge out of these words. Don’t shame people for falling somewhere on the spectrum that doesn’t meet your expectations. Don’t belittle people for being feminine or masculine any more than you would for someone who has brown hair. It’s how they were born.