It's not, as it refers to the two parts (female and male) of a binary reproductive system. There's no third type of gamete, and therefore no additional sex category that would make it non-binary.
Probably not. Sex has a material basis, gender identity an ideological one. The former has much more staying power than the latter, which is likely to be seen as an unusual fad belief in the decades and centuries to come.