hey Jordana, did you have any success in Samui? I went and was told that I should come back by the end of the month and that I would be covered under the visa amnesty until end of october (I have the same stamp like you, in my case until October 14th). But obviously I would prefer to have gotten some extension stamp or something in written form but they just told me to wait and come back later in the month. Hope it will be fine.