Do I need to leave Thailand every 90 days with a 1-year extension of stay on a Non-O visa?

So I screwed up my Type Non-OA visa and am here now on a 30 day visa. I am moving funds to apply for a 90-day type Non-O visa, then in the final month of that visa applying for an extension of stay based on retirement (I'm over 50). Question: If approved for a 1-year extension of stay, does this require me to leave the country every 90 days? Are there inherent limitations to this over my previous OA visa? A year from now I will have to return to the US for a few months- will it make sense to redo my OA visa when I return? If I don't have to leave the country during my extension of stay for my Non-O, it would make little sense to redo my OA while in the US. Thanks in advance for your help!