Can anyone make any suggestions for terminology that includes girls and women, as well as people who identify as girls and women, that includes mentioning the words 'girls' and 'women'?
Girl and woman are words that designate individuals of the female sex in humans, not an individual's preference for the sex stereotypes and sex role stereotypes of the female sex. They therefore include all female people who wish they were otherwise.
Just as vixen is the word that designates the female sex in foxes, jenny is the word for female donkeys, queen for cats, empress for chimpanzees and angeline for wolverines.
I would not entertain the notion that the sex designator words for female humans do anything more than tell you what sex a person is. Because
A girl is any personality in a juvenile female human.
A woman is any personality in an adult female human.
Otherwise the definition becomes
A girl is a female personality in any juvenile human.
A woman is a female personality in any adult human.
I wouldn't know where to start with defining what a female personality might be. I'm crystal clear on what a female body is though.
So, don't give away our words is my answer to your question. Do not cede any more ground. That notion was entertained by enough people around four or five years ago that now it's no longer just women and girls being redefined but the very word female, too.
Which proves that where it comes to the followers of the doctrine of gender identity, appeasement does not work. And after dancing with the unjust man for far too long, I for one believe that we are long past compromise, too. Stand firm.