Along those lines, ifixit.com has a variety of excellent tool sets. You can spring for one of the more expensive ones, but their Moray or Mako is going to hit a nice sweet spot for consumer repair. They also have magnetic project boards that hold onto screws and instructions while you disassemble an item, then guide you through reassembly by simply reversing the steps you took.

Apart from that, a set of Torx screwdrivers are good. A driver-and-bit assembly is great, but sometimes they are too wide to reach screws that are highly recessed in tight areas. For this, just a simple set does wonders. Torx require an exact match, so it does need a full set. They can be gotten for cheap.