Wow you have been busy in lockdown. Unless you get a letter from your embassy I am afraid the immigration office is correct. You can't go from amnesty to a Non O. If you get the letter they will grant a 30 extension and off the back of that a Non O if you meet the criteria
Never understood the free Amnesty. Why not charge 2000 bht for an end of year visa in country until the borders open and cut out the visa scammers and corruption. They have made a fortune. Common sense hey. Never a reality here.
then your OK. And no one is leaving except people like me who were on Thailand Elite and have to leave by September 26th because they won't issue a retirement visa inside the country after 7 years living here.