@Peter ******
we seem to be having a disconnect and you need to READ what I am writing in my responses
IF you showed up on a tourist visa, changed to an ED visa, used that for a year and now are on covid extensions you DO NOT NEED TO GET ANY Non-O visa 🙁
You can simply go to the immigration office NOW (seeing as you have the 800K baht seasoned in your account for 2 months at this point) and apply for the year EXTENSION OF STAY based on retirement
Again, just so you understand what I'm saying you do NOT need to get a Non-O visa at all, you're going to apply for a yearly extension based on retirement from the OLD ED visa/extension because the requirement to get a year extension based on retirement/marriage is that you previously held a non-Immigrant type visa (NOT that you held a Non-O, it's ANY Non-Imm visa) and you did hold an ED one so you just need to go apply for the year extension.
When you have 30 days or less left on your current covid extension, get the bank letter, update the bank book, fill out the TM7, and GO apply for a yearly extension based on retirement at the immigration office for 1900 baht.