You have some good ideas already.
You can keep project materials together until finished then store what's left (scraps or extra material) by color or size.
What are you storing your fabrics in/on?
I need to reorganize my stash...too many tubs and bags...I have a great 4 drawer (wide instead of narrow) file cabinet to keep my stash in and it is under utilized.