Conventional wisdom says a longer bbl will give you better patterns at 40 yds.
However, our experience has been that each barrel and load performs different.
Get a handful of what you intend to shoot, take both barrels and both chokes to the range.
Shoot 3 - 5 rounds per bbl with each choke.
Then you have a good idea of what your barrels like best.
Try to do the testing on a day that will be representative of when you will be hunting. Yes, that is difficult, however, try to get close.
Good Luck