Things may have changed recently... but yeah I have had to leave Thailand (tourist visa entry) and go to Singapore to get Non-B.
This was years ago though.
Nice if they would allow service stations to sell again.
Thinking of buying a sewing machine so would be great to slam a few frothies whilst the thing is charging.