I think in the fullness of time 'man' and 'women' can't really be differentiated from 'personality' - it's going to take us a long time to get there. We're currently using the words as somewhere between 'male' and 'female' and 'masculine' and 'feminine' - which is why the problems arise - but as the latter blur and become increasingly irrelevant we're likely to drop them in favour of personality descriptors and humanity will move towards a more neutral understanding of being.