Veggie Quilt - changing the layout

I've been plugging away at my veggie quilt and today planned to sew together all of the blocks. However, when I laid them out I wasn't quite sure that I like how things are looking.

When I see this, the pinwheels are just too bright and too busy. Here's the B&W version:

It bums me out to redo part of this quilt, but I really think those pinwheels ought to go.

Here I've laid out solid colors for those spaces. It puts the attention back on the applique blocks and makes the color scheme more consistent and less jumbled.  I'm thinking of doing some simple two-tone design, similar to those triangles along the edges.

I'm still waffling about redoing those blocks...it wouldn't take that long, but the pinwheels are cool looking. Hmmm.

Edit:  Here's another option I worked up. The triangles now match the block color gradient instead of going in the opposite direction. It brings more consistency to the piece. I also moved around the pinwheels to match the block colors better. What do you think?