I Think this option is better: " Or you can wait to apply your in-country Non-O until his first 90days finish if possible (means you can stay as a tourist until then)."
The ask:thailand community, consisting of multiple Q/A groups with over 100,000 members, powers this platform. It is not an official government resource. Our members actively contribute to this resource, and while we strive for accuracy, we cannot guarantee its complete reliability. Assistance to travelers is provided as a community service.