Where should I go to obtain my Non-B teaching visa after entering Thailand on a 30-day exempt?

Well due to a very odd temporary closing of the provincial consulate in Canada I cannot get my non-b teaching visa before I come back to Thailand on July 2nd.

I was on a non-o but I did not get a re entry.

If I come to BKK on a 30-day exempt, where should I look at going to get my non-b? Is Vientiane still the best option with the new changes?