Sorry for the confusion.
I don’t want to extend my OA Visa, I wish to let my OA lapse and instead get a Non O Visa. But from what I can gather, I would have to leave Thailand before the 22nd and return after my OA Visa has expired and then apply for Non O at my local immigration office.