I like the idea of resolving your border problem w/ trim to the narrowest and adding the same fabric back to make the border right (just in a solid long piece)
But if it bothers you like it is, this is what I would do. I would cut it into 4ths, and turn each 1/4 so your rectangles are going in different directions (like w/ a flying geese block). Fix the border issue like described above ( only w/ 2 separate halves) then use a thin strip of your dark boarder to connect the 4 quarters back together. Hope that makes sense.