I feel like a straight 16 team double elimination bracket would just be way better. It would be a few extra games (30 matches total) but it is still totally possible to get it done in 10 days while minimizing the amount of games a team would have to play each day.
I also agree with what others have suggested - 2 teams from each group and then a 8 team single elimination playoffs. This is also much better than the current format.
I really hope they revise this is some way because I'm really not a fan of the current format.