I recently saw an on-point quilt where the quilt maker used the border fabric to make the setting triangles instead of using the background fabric. It was a very cool effect-like a funky frame.
So instead of trying to match the fabric in the blocks, maybe purchase a bold contrasting fabric for the setting, border and binding? Just another thought to have in the mix!!