Which should I hunt with?

[owlhoot]

Get a good light and look down your barrel. The last newer super mag I had came with a barrel with a lot of tool marks and lots of polishing still couldn't get them out so it went on its way . As far as deep cleaning , it helps with the few others I have tried. I would guess how bad a barrel is before you start.
If you have a rough barrel just try both methods. A nice smooth clean bore sure makes it easier to work with.

[Longshanks]

Something that has been effective in patterning my turkey guns is shooting to achieve a pattern that is even and has no gaps larger than a golf ball. Having clusters of shot and fairly large gaps I would shoot another choke or two and look in to polishing if patterns don't improve. Wouldn't go through the trouble of sighting in to get POA/POI until you find the pattern you want. Otherwise you are going to be changing the sights over and over again.