I don't know how long this has been out, but a couple of other Freeps and I have posted very similar lists in the last few days. Where we varied from him was that we said have a revolver and a semi pistol, revolver in the .357 range and the pistol in .40 or .45, we also recommended a .22 pistol. A couple of guys recommended something in a .223, as if it's really an end of civilization scenario, most of the ammo available will probably be stuff scavanged from NATO or UN sources.
Whether bolt or semi-auto on the rifle is not a huge consideration to me. I have semi-auto, so will stick to it. If I had bolt, I'd stick to it.
My end-of-civilization rifle is a .223, for exactly that reason.