Rav Leff talks about that in the recording I mentioned in another thread. Actually, he talks about that in terms of Techiyas Hamaisim.
In terms of gilgulim, can the same person be both a man and a woman? I don’t see why not. I don’t think Neshamas have genders.