Firstly, please understand your Non Imm O expired a long time ago, but your Immigration status is Non Immigrant.
Visas cannot be extended, each year you are extending your permit of stay by 365 days from the original 90 days granted from the Non Imm O visa.
Based on retirement, your extension renewal date can only be changed by leaving the Country without a re-entry permit, which cancels any permission of stay already granted.
Then start from scratch again.
IMO the easiest option is to renew your extension in early May, then leave without a re-entry permit when you later travel back to your home Country.
Apply for the Non Imm O from your local Thai Embassy to re-enter Thailand, then continue with the 1-year extensions of stay.
Example, you leave Thailand for a visit home July time for 3 weeks, re-entering with a new Non Imm O in August, on entry you'll be granted permission of stay until November.
November will now be the month you annually apply for the 1-year extensions of stay.