Simple choice,
I'd take my Parker repro. 16-20 combo set. This way I'd have the best of both worlds. I'd use the 26" Q1/Q2 20ga barrels for the quail and grouse and the 28" IC/Mod 16ga barrels for the larger birds.