Is this really what you want?
To force a solution of your current problematic situation with no regard for the continuity of the story?
On the other hand, the origin of this situation also wasn't very consistent with this part of the story's timeline.
And we really need the story to move forward, to get to the interesting stuff.
I will have to think about this.
In the meantime
wait for a little bit,
try to relax.
And I will try to come up with a solution which doesn't break the story too much.