I would have cut all of my border fabric strips in one direction, either all WOF or all lengthwise. Then I would have mitered the corners or used a solid block in each corner. This way the pattern would have flowed around the quilt. Trying to keep the pattern in one direction on the finished quilt is what caused your problem.