Herpes scare after unprotected oral sex

About two weeks ago I had an anonymous sexual encounter. During this encounter, I only received unprotected oral sex. The oral sex was quite rough and involved quite a bit of scraping with her teeth. It was not rough enough to cause pain, but the amount of friction was uncomfortable at times.

Five days ago I noticed a bump on my penis. Upon further inspection, it appeared to me that the bump was an infected hair. It was small, looked like a zit, had a white head, and a long black hair was growing out of it. I plucked the hair and the bump went away in two days. It didn't open and there was no crusting over. After freaking out over this bump, I began to inspect the rest of my penis.

I then realized that a small area around the meatus (the part where the meatus meets that base of the glans (glands)) was inflamed, irritated, and looked somewhat dry and scaly. There is no pain in the area, no itching, no burning, etc. The urethra does not appear to be inflamed at all. Since I have noticed the irritated area, it has began to lighten up and looks more pink as opposed to red. Also, I noticed that the area seems to look much more red and irritated after masturbating. Therefore, I have stopped masturbating to try and prevent further irritation.

My questions are as follows:
1) I'm not having sex until I get some test results back, but I don't know how long I should wait to go in for an STD screen. When will an std test show accurate results for herpes?
2) I know that herpes looks different in each person, but do these symptoms sound like herpes could be present?
3) If it does sound like the redness and irritation is just from the friction during the sexual encounter, is there anything that I can do to help the area heal?