You did not have a Non-O as explained above and, if you've used your 30 day extension, you've left it too late to get a Non-O in country as you would need a Thai bank account with the required funds to apply. Your only option lies outside of Thailand.