I always do the extension in the last days. 2-3 days before the end is enough time to get all paperwork done. But lookout for Thai holidays - I have added the Thai holidays calendar to the calendar app for that. (Important notice: if a Thai holiday falls onto a weekend, the next workday is holiday!)