I bought a bunch of tupperware style plastic bins with lids all the same size. Organize my junk by trade, plumbing, home electrical, car electrical, etc. Keeps me from doing that for the most part.
Look at Mr. fancypants over here with plastic bins! :) That's what I'm doing now, pretty much what you said. Cardboard boxes with a sharpie written on it for now. Throw out the junk.