Yes you can I did it, without leaving Thailand (Uthai thani immigration, just ask your IO) before I got a OA visa and I change for O based on marriage.
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.