Gosh, I wish I lived closer...I would come over and help you sort this material out. I have been there many, many times.
I tend to organize by color only. I put smaller pieces in zip lock bags or those clear plastic shoe containers so I can see what color is stored there. Good luck with your organizing project.