I had the same thing with a messy sewing room. What I did is made up my mind that after I get finished for the day in my sewing room I will clean and straighten it up for the next day's work. There is nothing that will kill creativity (for me) than to have to work in a messy environment. Also, I downsized my stash by giving garbage bags of fabrics to the Senior Citizens Organization. Now, I only have quarter cuts of fabric. If I need to have more yardage, I go and buy it as the project dictates. This has worked for me.
Good luck!