I'm sure it's tough to have to keep battling. I think, though, you can take comfort when the episodes occur less frequently. I'm sure anybody would feel some stress in the environment you're in.
I suggest you stay in treatment with your therapist, keep her informed of triggers and episodes, and try to stay positive. I know that's easier said than done, but you are not alone. As far as when it will stop, I don't think anyone could put a date or time on that.