When you produce a certificate with the 31st April you get diplomatic status to remain.
Joking aside. I headed into town this morning to clarify my status. As I crossed the road after an ATM visit a 3 man immigration patrol politely asked to see my passport. My stamp runs out on Monday 27th. I said I was ironically heading to their office. No need! Just go back home and relax, you have a stay without any thing to worry about until 31st July. My experience and I can't vouch for any other experience. I trusted my office whole heartedly and was not too surprised at the result and pleasant friendly interaction. We posed for photos doing the checks and questioning then a chat about life in Isaan and effects felt this far as a foriegner. I'm married and there is an obvious likening to this during difficult times.
Terrible that the security threat is left to sort itself out on Facebook. Wife is not entertaining it either as can't make head not tail of it. Prepare in advance and it changes with the weather.
An answer with no solution. Excuses about national security. Why not make it clear plain and simple. All visa holders are permitted to stay in the kingdom until a grace period is announced to allow a safe timely exit.
Always ambiguity confusion and room for interpretation in the name of the excuse of national security.