@Sara ******
No need to go to the country of origin.
The Imm. officer said that I can enter Thailand on a "Tourist visa", and then apply to convert it into Non-B, providing supporting documents from the new employer, as well as address registration TM30, education documents etc.
Not sure about how long it takes to convert a visa. I haven't done it yet, cuz still preparing some paperwork.