@Nicholas ********
You would be on overstay, but the overstay fine would be waived because the immigration office would be closed :)
The 40K THB must be in the every month, and it can not be average
What's the Non-O for anyway? Is this marriage, being over 50, or raising half-Thai children?