Thats BV for sure. Your doc will prescribe meds for you. micro gel or clindess. Ive had it. It can also be hard to get rid of I've noticed. I'd go back to the doc for meds! Are you sleeping with someone unprotected?
Fishy smell is usually BV (Bacterial Vaginosis). You would have to go to the doctor to get medicine since there is nothing over the counter for it. Yeast infection usually doesn't cause a odor.
It could be but yeast infections cause you to be very itchy down there. You could try those vagisil screening kit that drug stores sell over the counter. It takes your vaginal PH and then goes by that to determine what sort of infection you MAY have. Otherwise you could just go to your OB and have a pap done and see what he/she thinks.