@Andrew *****
, there is NO grace period on a Non-O visa where you bounce every 90 days, you go before or on that date or you're on overstay.
If you're in Chiang Mai just bounce out and back in at the Mae-Sai - Tachiliek border with burma. It's the closest and the cheapest.