I am creating walls for a level editor which will be placed by players instead of myself. Therefore, every possible combination of walls must be taken into account and possible. These walls consist of two repeating tiles; the front and top face (navy blue and teal respectively), and edges that indicate the orientation of the brick (represented as the blue lines). Due to these edges, the initial 2 repeating tiles turn into 20 different combinations of face and edge. This is shown in the first and third image.

I made a test in the second image using two face tiles, disregarding the varying edges. While these tiles looks fine as a single wall, they look much less coherent and professional placed next to one another, especially in vertical lines (circled in blue).. It is clear that the edges are necessary, but is it really necessary to have 20 different tiles? Is there some shortcut or simpler method I have yet to discover? I have struggled to find resources or references online.
It is important to note that not only will I be making walls comprised of simple line&square patterns, much like the wall in the test image, but organic designs such as rock walls and hedges too.

Unrelated to this issue, when walls are placed in horizontal lines "on top" of one another with one grid space in between, it creates visual confusion (circled in red). Is there any possible solution to this without changing the size of the wall faces, which would compromise the 3/4 perspective?