@Mark ******
If you apply for a Non-OA visa from the UK, you can still apply for a one year extension of stay based on retirement. Remember though:
1. You can only apply for a One Year Extension of Stay based on Retirement when you have 45 days remaining on your current "admitted to" stamp (30 days for some immigration office).
2. You will need Thai health insurance for a One Year Extension of Stay based on Retirement from a Non-OA visa. This is NOT required if you entered on a Non-O visa.