I think you should try the traditional log cabin layout with all the lights at the top left because your colors are very bright (and a beautiful combination) so I don't think you need the placement of the colors to make such a bold design. But of the two, I vote for number 1.