You can start the process of applying for the Non O visa straight after you get back into Thailand. I did the same as you’re planning. I left Thailand to kill off the old Non OA visa, re entered Thailand the next day and started the process of applying for the Non O visa within the first week. Just wanted to get it all completed and not leave it to the last few days.