I got rid of the standard toolkit and ended up building my own roll of tools.
The standard kit tire irons are useless, throw them away and buy some motionpro tire irons or other good make ... that don't bend like putty!
I carry a small stubby socket wrench, a range of metric and whitworth sockets (maybe 10), some crowsfoot socket heads (1 1/2 and 1 1/16 for main chain gear and wheel bearings)
a 9/10, 11/12 wrench, an adjustable wrench, small vicegrips, a power inflator a screwdriver with multiple heads, motionpro tire levers w 22 socket and 24 socket (w/socket adapter so it makes for a socket wrench with enough leverage for the big jobs like removing the main gear), an electrical tester, elec tape, spoke wrench, small can of WD40, extra tube, a few nuts and bolts, extra bulbs and fuses, duct tape, a few feet of wire (very handy for tying on bits that just broke off).
Most of the tools fit in the toolbag I carry on the front forks; the extra tube and inflator are in my toolbox.
It's overkill. But I've got the room to carry it and it gives me peace of mind.
When doing my regular maintenance in the carport, I seldom need to go and get extra tools, which is a good sign, I think, that I've got most of what I might need for the road.