I guess it's a bit late after more than a hundred of chapters to mention this, but...
The fact that Bai Ji was a man has completely vanished from the authors' mind, hasn't it?
I think right now, it's probably better to think of Ji Bai and Bai Ji as two different people who inhabited/shared the same "vessel" instead of personalities (while, I'm pretty sure, originally it was supposed to be two different personalities).
Also, when Bai Ji was locked as “Bai Jin”, in that initial androgynous male form, her body changed after coming into contact with the sword, turning female. She referred to "that thing" as something troublesome or unpleasant, saying she didn’t want it to return. By “thing,” I’m sure you know what I’m talking about.
So if we treat Bai Ji and Ji Bai as two different people who inhabited the same "vessel", instead of personalities, that was the only time Bai Ji was ever a man (and she didn't like it, I THINK) while the other previous life she had was as Solanya/Soraya, not as Ji Bai. If I'm wrong to interpret it like this, feel free to correct me.
And like I've been saying in previous comments, I'm pretty sure the plot was supposed to go one way but then the author, after a certain point, decided to completely change it to go in another direction, and a lot of stuff got changed/retconned because of it, so now they keep making things up on the go. (Also, let’s not forget how a ton of side characters that could be still be relevant in more than just the arc they first appeared in are completely forgotten.)