It looks like you have a lot of solid advise on the pistol. As far as the shotgun, it
demends what you have to spend. If it's a lot, I like the Benelli M4. You can buy a lot of extras for it as well.
http://www.benelliusa.com/shotguns/benelli_m4.php
They don't give those away though, so if you want to keep the price down, you may want to consider a Remington 870 with the 20 inch barrel and the extended tube. You can also buy a lot a extras for that as well.