either way is going to work- so decide if you want the borders- or if you want the squares-- just remember that repeating the fabrics will change the look of the quilt somewhat- maybe sit down with some graph paper and color one both ways to see which you like better...either option is a good option- just depends on the look you want. :)
i've found sometimes coloring a graph paper sketch can really help figure out these design issues...