I just found that test of buckshot in a rifled barrel and I was pretty astonished by the doughnut, even though I had heard of it. I just didn't expect such an open circular pattern with such a completely empty middle. It is kind of like a hoop you train animals to jump thru. I believe there are two primary schools of thought for hd loads. One likes a load that opens quickly. I think they tend to live in less dense areas such as the country. The other prefers a tight pattern. I believe Dave McCracken, RIP, liked it saying something about how the shooter is responsible for every bit of shot and he wanted to keep it all on target.
There is no way of knowing well what anything will do without testing it, but at very shot disatnces like 2 yards I think the rifled barrel or choke wouldn't be a problem, but the rifled barrel could be a big problem at 9 yards. That picture of the Hornady through the rifled barrel at 12 yards barely stayed on the paper.
My guess is that the rifle choke the would impart less spin than a rifled barrel and that would mean less of a doughnut but the only way to know is to test. If I had gun that served for HD that took tubes I think I would simply not keep a different choke in the gun while home. Just as I swithch barrels when I take the 870 out to shoot clays and replace the short barrel when I get home.