It will continue this way, the variations in identity are continuing to grow along a spectrum. The problem with your point is that a counter argument would be to just call both groups 'women', but then that would lead to confusion in certain relevant situations (like in these kinds of discussions).  So, perhaps 'cis' or 'non-trans' should only be used to refer to groups when we are explicitly discussing gender issues or maybe medical discussions  - in normal conversation 'women' should be sufficient.
With respect to human rights - generic terms like 'gender identity' could be used which would not exclude women.