Handgun: everything you mentioned is good. Get something you're willing to buy ammo for. I also strongly recommend buying a companion trainer, a .22 that operates similarly to your primary. The skills transfer well and the cost (usually) of .22 allows you to get tons of practice per range trip.
Shotgun: Semi-autos are for the birds. Get a Remington 870 or a Mossberg 500 and mount a high powered flashlight to the front. 12ga loaded with a home defense progression that's appropriate for your tactical plan. If you must go with a semi, be sure you know where the exhaust is so you don't cover it with your hand while under duress. It hurts.