How To Treat Itchiness And Swelling Of Penis After Having Sex?

I am a male. I had a yeast infection that I let go to long trying to treat at home. I did go to the doctor and they treated me and it got better. But now when I masturbate or have sex it will itch and then peel. I had sex last night and my penis swelled what should I do