I should probably focus on the fact that a cleaner workspace is the goal, and with a cleaner more organized shop I can focus on creating work (sustainable work when possible) and honestly a clean & organized space is much more pleasant to work in.
So my default workbench mode of "extreme clutter" needs to end.