Now that I can see a layout I have a suggestion. If you number your blocks top row 1,2,3, 2nd row 45, 3rd row 6,7,8, etc. Now put 1 pieced block in #2, 6, 8, 11, 13, and 17. Use the light color you have for the setting triangles, a dark for the middle solids, and the light color for the center squares. Can't wait to see your finished quilt.
Darren