Oh and if your partner performed oral sex on you, you could get genital herpes type 1 that way, if he has herpes type 1 orally. This could happen even if he didn't have a cold sore at the time.
I'm not saying you have herpes, just that its a possibility.
Aj
It could be herpes and a yeast infection, or either one.
In any case, your doctor should have given you some valtrex or acyclovir to help, in case you do have herpes.
When you pee, pour water over yourself. That helps dilute the acid in your urine, and that will help it not hurt as much, whether its yeast or herpes. And as you mentioned, make sure to be drinking plenty of water, which will do the same.
Have you gotten more sores since you saw the doctor? If you have, don't hesitate to call the doctor (yes, I know its the weekend, but you pay this man and they expect to get calls on the weekends), and let him know and ask for an antiviral, just in case. It won't hurt you to take it if it turns out you don't have herpes.
Good luck!
AJ