Maybe get a new barrel for the wingmaster? I have one too, 26" IC and 28" modified, from back in the day.. Today I would just buy a barrel with Remchokes. I wound up inheriting an 870 Express Magnum with Remchokes, so I'm pretty well set when it comes to 870. They are impossible to beat when it comes to pump shotguns.