Did the run yesterday.
Ended up doing Club Andaman. 2600 Baht, all smooth. Took ferry, got stamped, awaited the next ferry. Point of interest was the immigration giving people a hard time upon re-entry to Thai. Assuming they are tourist visas as me on a non-o had no questions at all.
I did firstly go to the long-tail place but the immigration officer attempted to give me an 'intimidating' shake down, but I wasn't having any of it thus went to club andaman. Speaking Thai, non-o in hand and literally a passport full of visas, the bloke made himself look like a tit in front of a growing audience and his colleges. Hopefully he'll think twice before attempting it on somebody else.
Anyway, to anybody reading this.. Head to club andaman to avoid any potentially uncomfortable situations.