Cleaning up your workshop, and keeping it clean, is optimization of you, not the project you work on.

Any optimization done on yourself is always way overdue.

Through the wonderful glasses of hindsight, of course.

Optimization is only premature if the tradeoff between complication and outcome isn't worth it.