Welcome to HCM.
The symptoms you suffer can be caused by any vaginal irritation
including Trichomonas. Often vaginal infections are of a mixed Origen (bacteria, fungus and virus). As you hint it is also important that both sexual partners be treated at the same time. Remember that abrasion due to intercourse can cause similar symptoms without having to be an infection. It is best to have a smear taken to have the exact causation determined and treated. In the mean time I suggest the use of a condom.
I trust this is helpfull.