RE: Chokes...
centaur 1; I have found that a good barrel polish will normally improve patternsquite a bit....just the barrel though, not the choke.
You will probably find that the factory choke will give acceptable patterns to 30 yards or so....so as long as you keep them in that range you will do fine.