Hello,
sorry for you that nobody gave you insight about your situation. Since your flight back was two days ago, I am curious about how you handled the situation.
Sadly, I am in the same case as well, and I am thinking about crossing the border by land..
Hope you made it
Cheers.