Instead of re-inventing the wheel, we've sourced our option sets for gender and sexual orientation from the excellent Open Demographics project, maintained by Dr. Nikki Stevens.
It's a work in progress, and if you have suggestions on improving the dataset you can contribute to the project on GitHub.
The dataset is included in Meet Kinksters under the Creative Commons Attribution Share Alike 4.0 International license.