I did exactly that move ... CM to HH on a non O. Immigration here told me I had to complete a TM28 and get a TM30 .... that was maybe 6 months ago. The TM28 is easy to do and you can do it a Bluport or the main Immigration.
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.