The easiest way out of all of this is, unfortunately, a reset.
That said, I have no confidence that the writers are concerned with these issues whatsoever, so I'm not betting on one.
Reset is coming. You can bet on it. After all it's "shocking" (try to pretend not to see through my sarcasm) and that's seems to be the goal of STD writers. To produce "shock of the week" types of episodes.