I sounds like you do not like either one of these choices, you've done a beautiful job on the squares. I wouldn't just use the fabrics that are so-so, if you don't really like them. Use what you think looks best even if you have to buy something. If it were me, I would buy some fabric as close as I could get to the light /yellow/gold solid fabric, then use a brown and red border (or at least a brown border). The red is okay, but it doesn't flow too well.