Double your batting and use a mid-loft poly for the layer directly underneath the top. This will absorb the fullness of the extra fabric, which is what causes the "wave". Plan a quilted pattern that has some flow to it (a meander, a curvy stem for feathering, etc.). The extra batting will give the quilt a visual punch with lots of texture. If you're dead-set on a flat batting, and you prefer to avoid sewing in tucks or pleats, then you really have no other option that ripping and resetting. Good luck!