I think the best you could do for an upland setup, would be O/U or SXS 16 gauge. That is my personal setup.
You could go to 20 gauge, nothing wrong with it, I just prefer the 16.
12 gauge for me, would not be the choice in a dedicated upland shotgun.
Pump action would be my last choice of action as well,...
For me, there is a three way tie for upland, ...Semi, O/U or SXS in 16 gauge.
I like a 28 inch barrel in modified. For the double,..M/M or M/IM or M/F
M/IC is good, but a little limiting..for me.