While many have tried to tie the 2 concepts together, Gender Identity is an entirely different concept to Sexual Orientation.
While you are more interested in scales for gender identity, as you are asking about both, I will give information on both.
Sexual Orientation Psychometric Scales
There are a few psychometric scales for sexual orientation. The most ...
I know that the question is old, but it is still relevant so I will attempt to answer.
In the meantime Johnson has developed a 120-item version of the IPIP-NEO. The development is described in detail here:
Johnson, J. A. (2014). Measuring thirty facets of the Five Factor Model with a 120-item public domain inventory: Development of the IPIP-NEO-120. Journal ...