I guess we do need separate terms for the two concepts currently sitting under gender. However, given the way gender critical feminists are already arguing against the validity of trans people, I don't think it would be wise or fair to just let them have their preferred definition of the word (gender) we are arguing over.

Perhaps something like 'gender orientation' (for the innate part) and 'gender construct' (for the socially constructed part) could work?