You can do the 30 day extension at the small IO In Patong beach - Cost = 1900 baht.
TM7 Form
Copies of passport page, TM6, Visa exempt entry stamp, all signed plus 1 passport picture - Simple & quick process at the tourist friendly office in Patong.
Then maybe a possible 60 Covid extension.
The Non O has to be done at the main IO in Phuket Town - I tried to apply for a 90 day Non O myself last week, but was unsuccessful.
Im pretty new on this forum & a lot of folk dont like " Agent" talk.
I can tell you though, that it is highly possible to get a 90 day Non O Visa PLUS your 12 month extension - At the same time - With or without the financials.
This service takes approx 3 weeks & obviously incurs a service charge.