There's an ad for some visa service that keeps popping up on my feed. It's something like "we can get you a volunteer visa". Is that a Non O? Seems a bit dodgy as well :)
I would wait to something like mid July for government to clarify. My bet is they will extend the grace period. If not or no announcement, time to look for flights.