Update: just got back from the consulate. He asked about the Thai police certificate and we explained we don't have it since we only recently arrived to Thailand... He was a little grumpy about it but accepted the paperwork. So I think that's a good sign? Said next time you will need it. We will pick up our passports tomorrow afternoon.