sounds like you are stretching your fabric on your borders maybe as you sew them on.... I measure the sides, middle and cut my borders to fit. usually the measurements are the same. But since I'm not perfect, it pays to check.
pin, pin, pin and then sew. no stretching as you go along. If your quilt doesn't lay flat or waves as you say, this is your problem.