Welcome to Anandtech Forums, groggy dog.
Yes to what you listed, plus good tools. Don't get a "computer tool kit" but instead piece together your own kit. You'll need a magnetized #2 Philips in various lengths, plus diagonal cutters, plus slip-joint pliars, needle nose pliars, flashlight (my preference is one that uses a single ultra-bright LED running off AA sized batteries), desk lamp (one of those on an adjustable arm), extra network cards (PCI Realtek 10/100 is great because most operating systems already have drivers), bootable USB flash drive, digital multimeter, cable ties.
Common spare parts are also useful to swap in for troubleshooting, such as a power supply, RAM, video card. Having a working computer with a DVD burner, big hard drive and fast internet connection handy would be great for looking up error messages, burning driver discs (use USB flash drive for normal stuff, burn discs to hand to people) and backing up or recovering data.