I only need another 10 days so I will just do a border crossing. There is Kapchoeng Immigration at Chong Chom but I do not want to get into the whole TM.30 issue so border crossing might be the go.
ok. thanks for your help guys! I am glad to have found this group. I have mostly stayed in hotels/guest houses in Chiang Mai or in AirBnB in Bangkok so it has not been on my radar.