I think, the extension of stay should be cancelled. I'm on the same page as you are and as I was adviced here before, they told me to get a cancellation letter from my school and bring it to Labour office to cancel work permit then bring the receipt to the immigration to cancel the extension of stay. They said you will have a hard time coming back in Thailand if you haven't cancelled the Non-B extension of stay.