Yeah, I'm kinda hoping to just resolve this at some point in the not-so-distant future so that the tension can ramp back down - keeping the tension level too high for too long kinda starts to create a bit of a gravity well effect, where everything's warped by it.
Of course, given that O'Connor's pissed off at Fionn for something that he legitimately didn't do, it does raise the question as to just how we're gonna resolve it...