Shop keeps getting trashed!

I was pretty messy when I first started wrenching in my dad's garage but he's not a car guy and eventually got fed up with my junk everywhere. He cleaned it all up once and threw everything in the trunk of my Duster. After that I started being more organized, especially after having to move multiple times and more recently working at jobs where I had to share tools and workspace with other people. Now when I start something in the garage I get obsessive-compulsive about cleaning up and putting my tools back where they belong or else the job "isn't done yet". I have half of my garage taken up with moving boxes, engines on stands, toolboxes etc since moving in about a month ago and it's driving me nuts. I have nowhere to put it though until I have some extra cash to buy a shed and put it in the back yard.

I also really want a steel workbench, only had wood in the past and it sucks for automotive work.