Yes, yes to all of those things, those are my thoughts exactly, and I've edited my post to put them in. The reason I think this will happen, is, apart from what you've said, that we've been told there will be some sort of enlightenment for the audience on what exactly is going on between the two of them. Given what we've seen of the filminng so far, the five epiosdes seem pretty action-packed, and I don't think they'll provide us with enough downtime to subtly show the audience what is going on, so I think what will happen is that they'll tell us, in some sort or goodbye scene, and retcon seems to me to be the obvious choice.