Don,
Have you identified if the barrel bore of the top barrel is off or if it was just a misaligned machined screw choke bore and thread? 16" @ 40 yds should be discernable by blocking up the barrels and sighting the bores vs. the other barrel and the sight picture.