@Graeme **********
no one knows IF when the consulates re-open they will continue to issue year-long, multi-entry Non-O visas as easily as they did before.
IF you get a yearly extension, AND during that time the consulates do open, they do issue the year-multi-Non-O's with no proof of funds (the ones that did it anyway) you certainly could look into that option