Agree that you cannot get a new visa with your work permit. You should have extendex it by now.
Most likely you need a new non-b with the papers from the work.
I do remember few years ago soemthing like this happened to my friend. They refused him to give a new tourist visa with the reason you lived in thailand long enough. So if i were you i would make sure you have the papers from the work and get non-b