My advice before doing a border bounce in order to cancel a valid OA extension of stay is to make sure that your immigration office can accept a Non O visa "retirement" application.
Because not all Immigration Office in Thaïland allow it.
For example, at Mae Sai Immigration Office (main office for Chiang Rai province), they don't accept a Non O "retirement" application for those who had an OA extension of stay before, even if it was canceled by doing a border bounce.
They tell to people to go to Thaï Embassy abroad to do it, at Vientiane for exemple.