That's fine too. It might be easier than having him wake up first and trying to explain what's happening when this could end up being a really tricky time crunch since we're playing with that one hour of polyjuice time.
And this isn't all on you, I promise. Basically it seems like Yaxley is considering any of the hitwizards+ who were on site who were fighting Death Eaters instead of by their side as a sign that they're in the Order. The only reason I think I might not be totally fucked yet is because Jeremy was a bamf and got Lestrange good.