Look at the time to organize and storing tools in easy reach as an investment. The time taken now will quickly be repaid in a more efficient work environment and pay dividends by not spending so much time looking for stuff and shuffling piles around.I'm torn between spending time putting things right vs. actually making stuff.
I hate it when the mess starts to creep up to the point I am looking for the tool I just put down and disappears in the clutter, time to put everything away. The mess creep up because I know I will need that wrench or drill bit, the tap, the collet later so I do not put it away.
On the other hand I enjoy making shop improvement between parts, it clears the mind before to tackling a difficult part.