This is Thailand and you should never ever let your visa expire if you stay here long term. Especially now when it's difficult to deal with the embassies. You never know if you can get back in.
I would do it a week before your visa expires. Make sure all the documents are prepared and ready . I did mine last month and I got my under consideration on the same day as applying.