Hunter's Star blocking

I finished up piecing my Hunter's star using Moda Fabrics' Floral Gatherings line, and now it's time to block it out! I have 42 9-inch blocks, so I'm going with a 6x7 arrangement. At first, I thought to go all willy-nilly and pull blocks at random to place, but the more I looked at it, the more I thought some of the star points were lacking not being with similar colors. So I switched and swapped, and I think I'm finally happy with this arrangement:

This is more or less the final arrangement I settled upon. I moved around some of the green and orange blocks within their color groups. I almost wish I had six more blocks to make the grid 6x8, but I may just be overthinking it. 

I'm still considering what to do for borders. I would like to use this on our queen size bed, but as it stands now, these blocks will come out to only 54x63. That's quite a bit of area to make up to cover a mattress that's 60x80, not even counting overhang. I was thinking of a plain 2"-3" border, then another intricate pieced border, maybe just of the star points, followed by another plain border. And maybe the pieced border only has star pieces grouped intermittently throughout the border. I haven't decided. Let me know if you have any expanding ideas that would help me get the finished quilt to somewhere around 90x106, or whatever the recommended queen quilt size is.