I am going the same route. My non-O visa based on retirement in my German passport expires in May and I am changing to U.S. passport and non-O based on marriage. Good luck!
It depends whether you have any long term plans. A non-O based on retirement like many other visas does not offer any long term perspective. If you are thinking of Thai citizenship you need to opt for the non-O marriage as a starting point for all endeavor along that route.
Nope, they also asked me (non-Thai) what I needed the International Driving Permit for and what countries I was planning to travel to. All this information was recorded by the clerk 🙂
This is probably what you are looking for… bring your permanent (5 year) license, passport as well as confirmation of residence from immigration or pink card to the land office. Arrive early as it takes a while.