@Robert ******
The officer I just spoke to, checked both my passport and WP, his words are ‘ ok if your business finish, you can still stay till number 26 September’ and I reconfirmed’ for this Non-B visa krub, and he said yes no problem it’s for all.
It’s the same officer who is there for last 2 years.
But I will still go and cancel my work permit on Wednesday after the holiday.