At this point just make him girl permanently, dont dilly dally hes cured. We can see that mc is actually happy to be back only for it to last like a day and suddenly hes fine for things to be like that again. I get that this is porn with plot tho. But yea feels like straight porn with bl bait