FWIW, I suspect Neobie original timeline is closer to the truth, but I suspect the sighted pitstop photo with Phil and of the greeter at the temple may have been for the first Laotian leg, but I agree with there being two legs in Laos, and two in NCMC, even if some of them were short in actual duration.
I could see this because I do think there's a very long flight with connections ahead at some point in the Race, and to keep filming within their desired 21-23 day length, there was going to have to be some short in time duration legs to make up for it.
So I think when the teams and Phil leave Vietnam, it will be for Leg 6.