For the guy who already has a boatload of tools.

Are there any bicycle specific toolkits that forgo the formality of including basic things like screwdrivers and allen wrenches? I have worked on cars and motorcycles for the past 10+ years and have accumulated a lot of great tools, but the more I ride (especially my older steel frame bike), the more I find myself wanting to service the bottom bracket, replace the headset, etc.

So is there some sort of intermediate kit that would fit that description? Or would it be just as much to buy the specific tools as I would need them? Part of my brain avoids doing more important jobs because I'd have to buy the tools at the same time (higher cost in my brain). If I could just get myself to buy the tools all at once, I could just do what needs to be done when it needs to be done.