Glad to finally have some good news about all of this. I hope that you can get that longer visa in Cambo once you are there. From what I hear from my local friends visas are easily acquired depending on whose palms you grease once you are there.... but I would imagine that you have waaaaay more experience with this process than the people I talk to locally.
Let's keep our fingers crossed and hope all goes well!