Usually waves in the border means there is too much fabric in the border. Measure the body of your quilt, cut your border to match ( I leave 1/2 inch extra) and pin the the top and bottom to the quilt edge. Then evenly space pins between the top and bottom easing any extra top along the way.