I watched a show on Quilt TV (host name was Jodie) years ago and the instructor showed how she fixed a wavy border and it was invisible. Hard to explain but you tuck in the fullness under the seam before layering. I use this method and no one can tell. I don't measure my borders, just sew them on and cut to fit if I use a border.