Can I use my Non-O visa upon re-entry after entering Thailand on a visa waiver?

The user initially entered Thailand on a visa waiver before their Non-O visa was issued. They're inquiring if they can use the Non-O visa upon leaving and re-entering Thailand, or if they should extend their initial waiver and perform a border run instead. Comments confirm that the Non-O visa is valid for a year, allowing for multiple entries, and they can indeed use the Non-O visa upon re-entry after going abroad.