@Lee *******
Yep you would indeed, ๐
The reason I told you to wait is you can't leave the country once you apply for the Non-O visa at the immigration office until the under review period is up and you go back to get the Non-O and new 90 day stamp inked in (usually 2 weeks but some offices 3)
SO
get the 30 day extension, go on your trip come back on a fresh free entry stamp and go apply for the Non-O
AND
you might as well get the hand out for the Non-O visa requirements at the immigration office while you're there getting the extension BEFORE you leave so you know what you're doing once you come back