If you have the opportunity, apply for a Non-O retired 90 days before you travel to Thailand if that works for you. It will becomes easier for you! to apply for a one year extension in Thailand.
And also cheaper! using an agent becomes more expensive😅😅