Am I covered under the new amnesty law for my non B visa until July, and what about border runs?

Hi guys! Sorry if this question has already been asked, have had a read through but still unsure of some things.

I’m on a non B multi entry year visa (with work permit) still valid until November 2020. My current stamp expires 26th May and I would need to do a border run.

Am I right in understanding that I am covered with the new amnesty law and would not need to do this border run until 31st of July? And if so, would this have any affect on my current visa when I re enter?

If it’s possible and borders have opened up in a month when my border run is due, I would still do this as planned, but just encase things have not relaxed enough by then, I don’t want to risk leaving the country and not being able to get back.

Thank you in advance!