I don't think Sanji will came out as a woman next chapter, but there is enough setup form the spark of a form of acceptation. In which case, Sanji could come to term with his identity at the very and of the story.
But that is only if Sanji's identity crisis has something to do with his feminity, which would be an exceptionnal developpment. I think the rationnal thing to expect is simply an acceptation of self within the realm of his traumas. Finding a way not to scrap a part of his autodestructive behavior.