@Steven *******
listen the easiest and quickest way to do this is to "border bounce" without a re-entry permit OR if you have a re-entry permit on the date that stamp runs out
Stamp back in to thailand, to get a 30 day visa exempt entry stamp THEN immediately get your sh*t together and apply for the in country Non-O visa at the immigration office where you live for 2000baht. That way you don't have to fool with what the requirements at this or that thai consulate are OR if you meet them or not. Just get OFF the OA visa/extension/entry stamp and back in on a 30 day visa exempt entry