Nice to see this thread revived from the dead
I did something very similar in my shop. I used 2x.120 and 2.5x.12 square tube with a goal to be modular because I can never make up my mind on how I want things. Ignore the mess in the pic, I assure you it has been organized since then.
I terms of organizing I built some shelving out of 1/2 sq tube and expanded metal so it wouldn't hold dust. I also bought cheap clear totes from HD and a label maker off Amazon. Best thing I've done in a while. So nice to be able to find things for once and not have clutter in your workspace.
I added LED strips off Amazon below the edge of the shelves with double sided tape. it really gives great light to work in. I also swapped all my 4ft florescent tubes for the non ballast 5K LEDs from Amazon. It's soooooo nice to have good light now. Worth every penny