I agree that this is the goal. And a worthy one. However, I think a lot of the controversy around self-identity centric models of gender is that they don't achieve that goal. They don't allow people to talk about the physical aspects of sex, which is something that lots people want to do. And they redefine gender in such a way that many people will feel like they no longer self-identify as the gender they identified as their entire lives.