Thank you, that is very helpful. I am heading back to my home country and will get the visa there.
I'm concerned that once in Thailand doing a border run to Malaysia post covid will be the difficult part. It's more difficult to find bus companies doing that journey now.