Bv? Yeast infection?

I take nexplanon so I like never get my period but I got it and after it stopped I got this weird smell it was bad. It wasn't fishy but more like sour. So I read and it sounded like bv so I was going to go to the doctor after I got back from vacation. By the time I came home it seemed to have gotten better. No smell. (I had been dealing with this for like 2 months) so I'm home Me and my boyfriend were having sex again everything is great. Then I noticed I was a little sore. And now it's more sore and the discharge is chunky. Which for me usually means a yeast infection, Which sucks but oh well I'll buy a 3 day Monistat like I normally do. But I'm wondering if the smell being gone was just a symptom of the yeast infection and that once that's done it will come back or if after my yeast infection is gone I'll finally be back to normal?