I think herpes is unlikely in your situation. Given the fungal infection issue already present, this sounds more fungal. And you’ve really not experienced typical herpes symptoms.
It’s fine to test at 12 weeks out and it is also fine to start using condoms with sex with this partner, yes. If you use condoms and she’s on suppression, the risk of transmission is so low.