I like your suggestions of kissing and trans surgery.
About hermaphrodite, I think is fine as it is, because hermaphrodites are found among animals and are able to reproduce, intersex people can't reproduce without help. In the game hermaphrodites can reproduce, if they can't, they will be intersex.