Possible yeast infection... very unsure. Advice??

Alright. Long story here. I've been sexually active for about 5 months with the same man. I'm on the pill and we use condoms about 75% of the time. Around Thanksgiving time, I noticed the feeling of constantly having to pee, but without being able to, classic UTI symptom. Anyway, I didn't have pain when I peed, but my labia looked a little swollen and I had thicker white discharge but no itching. I went to the doctor and tested negative for both yeast infection and UTI but the doc said I could still have an infection. Anyway, she gave me a one time yeast pill and I felt better for a few days. Fast forward to now and I went back to having sex on the regular, about once a day, and the symptoms are back. I'm peeing a ton, about 15 times/day. I have mild pain inside my vagina and heavier discharge. Not sure what this could be or if I should go back to the doctor. Is it a yeast infection, UTI or something different??