Why not apply for non-O while abroad.
Penang in Malaysia did it for me based on marriage.
Didn't have to go to the Consulate, Jim visa service on Chulia street fixed everything for me.
Had to go because new boss on Samui immigration didn't want to convert my non-B to non-O
Hadn't been on a visa run for ten years, Jim recognized me as it was yesterday.
If you're going to fly, Penang is a better choice.
No visa to Malaysia, the food in central Georgetown is amazing.