I think straight lines would be good for this quilt. Two rows would be good for both sashing and borders. As was mentioned above because of the type of quilting you have already done in the blocks, I think the decorative stitches will be too tight and cause puckering all along the length of the stitch. I also think the straight lines will enhance the overall look of the quilt, i.e. the sashing and borders.