In great accord with your appreciation of Thai Visa Centre. They have done the same for myself. And given great peace of mind living here in Thailand. My sincere respect and appreciation for Thai Visa Centre and staff.
Why would you not just renew the extension another year rather than expose yourself to the horrors of an in country Non O visa application and it's requires?