I would put more dense quilting on the outer border. That should tame the waviness. One thing to remember when your are quilting is to try to have a uniform quilt density over the whole quilt. It doesn't have to be the same quilting pattern, but it should have the same approximate density.