I don't agree with your "yuk" description. How can it be yukky when you are using colors that are in the feature fabric? They will go together and the result will be so much better than the sum of the parts. Don't JUDGE each block as a stand-alone. Instead trust that the parts will go together in the end.
It may help to separate the scraps by color line (all the pinks together, all the greens together, etc.) OR add a separation by value (Light reds, medium reds, dark reds, etc). THEN decide for yourself which bin you pull from. Make a rule that you can ONLY SWITCH IF YOU PULL A FABRIC THAT YOU JUST USED. Everything else - - - you gotta use.
Have fun with it. If you REALLY HATE IT in the end - and I DOUBT YOU WILL, then there will be someone else just gaga over the top. No worries.