you can go direct to the non O visa, i just did that a week ago, entered from Cambodia Visa exempt and the next day went to Immigration and did the application, you will need two copies of all of your document as it has to be sent out for approval, you will use TM87 for your application, they told me to come back in two weeks for my stamp