Pubic follicles seem infected with pimple like discharge

One week ago at a party I had some pretty rough sex with my girlfriend. I'm not sure what could be relevant, so here are some things that I think may have contributed. First off, there was a lot of grinding friction, and the rough sex went on and off for quite a long time. I would say we spent at least 2-3 hours having sex, as I was drinking and couldn't climax. My partner and I were expectedly pretty sweaty. We had also been swimming in a chlorinated pool about an hour before the sex began.

The next day I had a general soreness, but after taking a shower and going on about my day I didn't notice anything being wrong. Later in the evening I noticed that my pubic hair was tender neer the root, so I took a peek. What I saw almost looked like acne. I took a shower immediately carefully cleaning the area. As I washed, most of the bumps popped it seemed with a small amount of white discharge, sort of like an infected hair. 

The affected area is only where a grinding action would of occured. The base of my penis seems to be the worst area, and the bumps only occured where a hair was present for the most part.

The really bad part is that I work in a warehouse where I sweat profusely so that seems to be hindering the healing process. I have tried using some regular unscented lotion and neosporin, but neither seem to have a very big affect. What can I use to stop the irritaion, and hopefully be rid of the spots? It's becoming difficult to work and I'd like to get back to regular intercourse ASAP. I did try to trim the hair, as it was sort of getting shaggy and I thought it may help the tender follicles. I trimmed too short and the spiky hairs are causing more irritation. I know I should have shaved in the first place but the bumps were already there so that was a bad idea.