Keep the squares, but just use one "cobblestone" pattern to be consistent.
What do you think of this?
Is this what you ment?
Yes, much better! (in my opinion) More consistent this way.