So much for going home to Bangkok. Just been to the Thai embassy in London to see whats going on with the repatriation flights to Thailand. After you jump through the hoops and register, buy insurance, pay for the quarantine hotel, supply all the requirements and log in to the repatriation web site turns out it a lottery. I logged on to get my seat within 15 seconds of the site opening and still never got a seat. Was told at the embassy that you get picked, so looks like it doesn't matter what you do.
The embassy people were very nice but said try again next month.
So here I am.