I like both. If I were doing it, I would probably do the first layout but use 2 different color squares in each block, i.e., instead of 2 yellow or 2 blue, randomize it by using a red and yellow, or a blue and yellow.
What's great is that they all look wonderful!