What Does Irritated, Itchy, Raised Spots On Penis Post Unprotected Sex Mean?

Hello, two days after having unprotected sex i began having red and white pimples all over my penis. I went to the doctor got tested and everything came back negative, and the doctor said that it is most likely folliculitis and I put some topical cream on it for 10 days and they disappeared. That was about 2.5 months ago. I ve been with the same woman since, and we have not been with anyone else. I then received pretty much the same thing again. Except I noticed black spots within the raised bumps about the size of a tip of a pen. So I started applying Topical cream on it the past 3 days. It seemed to be helping. Then I just noticed a few hours ago that it started to get really irritated and itch. I took a look at my penis and I noticed that next to the folliculitis I developed very small clear blister like clusters. I am going to give it a few more days. And hopefully it will all go away with this topical cream. In your opinion from the description I gave, what do you think I have?