Like said in this thread, do a fresh draw in rnd of 16.
Pot 1 with teams that finished top, pot 2 teams that finished 2nd.
Then no one knows which route they will get in the group stage.