I was in the exact same situation as you. My choice in the end was to not chance having a problem at the airport and just went to immigration early in the morning lol
My passport filled up and with my new passport was a letter addressed to immigration to transfer it which was free but it was yet another long day at immigration. I'm sure it's a similar process for your embassy too
I took one year and can speak and write a little. I would love to take more classes but thought it wasn't possible without taking half Japanese and half advanced Thai. I'm still confused as to if I was misinformed or not
What is the name of your school? I took 1 year of Thai and wanted to take advanced classes but was told I can only take 1 year of Thai and had to switch to another language and do
Oh the school made it sound like the visa rule was that u could only take 1 year of Thai classes on a student and then I had to switch it to a Japanese student visa. What's the name of your school?