As Robert says, you'll need to get back into Thailand before your current non-o 90's stamp date.
You could apply for a non-o before returning, however you will also need to provide insurance cover to satisfy that, as per the image.
Where as if you just come back on a tourist visa, and apply for a non-o in country. A pain I know... You will only need to meet the much lower insurance requirements of Thai Pass
************************************************
*******
/17/nonoretirement/