This seems like a rather simple fix if Noah wants to return to being a guy. But of course no one's gonna take the time to get an understanding adult woman (possibly one who makes it her trade) and get a smooch.
I have a feeling that the happy ending is them becoming best of friends and the flying wizard Noah finding his gurl, but I could be wrong, this is funny....been waiting for this ch, Lol....