I had this same problem before I took Quilt University Class 101. You have to have a perfectly squared quilt top before you add the borders. Measure your quilt top and measure again. Use a walking foot to sew on the borders. I have not had a wavy border since doing this.