Yeast infection or what?

I had some dischcarge and light itching several months back in Aug. thought I had a yeast infection went to Dr. and she said yes looks like yeast take a one day does of Gyno-something it went away. Two months later same thing came back....vulva was swollen red and sore inside. Some discharge not much, ordered refill of RX it went away, less then 1 month it's back.......no swelling, barely discharge no smell no itching, just sore inside when my husband and I tryed to make love it was too sore. He also has some tenderness now and got irritated from love making....anyone have any idea of what this could be?? I am thinking he passed it back onto me since he never was treated?? thx!