I'm on a multiple-entry non-B and supposed to do a border run before mid June. Usually I just fly out and in but that's not possible now. I don't want to do the amnesty thing cause I predict massive chaos coming July 31st. Do I have other options? Are any walk- or drive-in borders open in the first 2 weeks of June? Where can I get official info on this?

Thanks for any help and sorry if it has been discussed, I did a search but nothing and too much came up.