This sounds super daft but I think it’s a great tip that I received from a team mate.
‘If it comes off the bike, it goes in the bag.’ I used this whilst packing my bike up for it’s first airline trip and subsequent journey home.
Everything from the valve caps to the pedals went in the ‘bag’. Nothing got put to one side, it went straight into the bag. Once I’d removed an item, I placed the tool(s) I’d used in an overnight travel wash/toiletries bag. This meant I knew I had the tool(s) to fit the item and I wasn’t tempted to pack excess equipment.
I do appreciate that having the time to do this in an orderly fashion is arguably the most important factor.