It took a good 3-6 months, Sho. A little quicker than that for the sexual connection (ironically, since that's always been our toughest issue), but the deeper emotional bond took several months and REALLY took about two years to fully get back to where it should be . . . and then better.
I think our situation was different than yours in that I pretty much vanquished the affair and pacified the town before I sought to negotiate a peace accord and then live under it, LOL. Your approach has been much more "blended" I think.