Thanks very much everyone.
So it looks like I will have to just do a standard visa run, return with a new tourist visa on arrival, and once her Non-B and work permit is completed, only then can I apply for a spousal Non-O?
@Anna ********
@Sioul ********