almost all upland birds in N America are shot well within 35 yards. (I mean 98% or more)
Ammo today is WAYYYYYYYYYYY better than it was in the 1900's when choke really became prevalent. Plastic wads and shot cups, the shot is way better, etc.
use a cylinder (or skeet) choke, you'll be way happier.
I hunt pheasant and chukar with 1oz 12ga loads with #6 shot and cylinder choke. If I do my part, they fold right up DRT.
Most people way over-choke and use way too big of loads.