Update: I'd like to update this for anyone else in the same situation. I went to the Labor Bureau to cancel my work permit, and was told it was unnecessary to come there first. Additionally they told me I could not cancel the permit by myself: a Thai person must accompany me. So I went to immigration where everything
@Ellie ******
was correct: my current extension was cancelled, and I was given 7 days to leave the country, which is perfect. The process at immigration was finished quickly and before noon. Thank you everyone for your help.