Organizing beads - Help!

Coming to the end of the year, I am making an attempt to organize my beads.    I've started making these little gourd figures that require a lot of beads.
Having to sift though EVERYTHING to find just what I'l looking for had been very time consuming.
I have some in plastic shoe boxes, some in drawers in baggies.   Yikes!

First pass is to try to at least get similar colors together.   I'm using old lunchmeat plastic containers like this.

The problem appears to be that some of the colors won't fit in such a small container.  
This is an embarrassment of riches, I know.   But I've been collecting these beads for over 40 years and there are a lot.

Anybody have any wonderful bead storage ideas?