I prefer the original layout too. Your's is also vey nice. Might also be nice to consider strips (maybe neutral) between each block to breakup the pattern a bit and maybe a wider boarder than the original. Just a couple thoughts...
Looks good though!
