BV or yeast infection?

About a month ago, I took an antiobitoic for a UTI, after that I thought I had a yeast infection from the antibiotic I took. It has gone away and been back, I went to the DR and she said it looked like yeast infection but it turned out to be BV. I took medication but not sure it ever went away. It now just comes and goes only since that UTI but it’s quite embarrassing when I have sex with my S/O (thankfully he’s awesome and very understanding of my body). It is clumpy and also yellowish. I am itching every once in a while and slight discomfort. The smell is mild but there. Any ideas or tips are very much appreciated.