Personally I still think Male and Female is the way to go, as a male identifying as a female or vice versa is covered under one or both and that goes for the reverse. A person who has undergone a sex change or are on that path are also covered until the operations are completed with Male/Female or vice versa.
Though if you identify as a table lamp you need unplugging..