Definitely sounds like it could be thrush to me. It's obviously too late now but I would have suggested at the very least two things last night. Firstly a long soak in a warm and very salty bath. This sometimes helps to at least soothe the itchies. Then painting yourself liberally with natural yoghurt (with acidophilus) and eating some as well. Short-term fixes but do work and help with that awful pain. I know EXACTLY what you mean. I had thrush two cycles ago and it was miserable. I was in tears when I told DH where he could stick his tadpoles because it felt like he'd wrapped sandpaper around a certain part of his anatomy.
One thing that crosses my mind. When you were treated for thrush the first time, did you and DH bd at all? And if you did, was he treated for the thrush as well? If not, there is a distinct possibility that he was harbouring it and has passed it back to you.
Bookmarks