I would adjust the grid angles to match the angles in the body of the quilt. Quilt the center first then start on the center most area of the border and quilt out toward the outer edge for the grid lines to keep everything square, straight. If you quilt from the outside in you can create the ( wonky) edges you are concerned about.