Thanks, everyone. Yes, as I already have my ticket and would like some time in Cambodia, it looks like the best thing to do is come back via a land border. I've done the Koh Kong route once already this year. It would be interesting to try somewhere else if the road is easier. Anyway, the plan is to get a proper visa situation sorted out so that this will hopefully be my last border run for the foreseeable future.