Here's where I'm currently at. With careful adjustments I can reduce the waviness to just a bright band on the leftmost edge. I think that's good enough for now. I'm going to pop it in a cabinet and let it run for a while and see how it goes.
P.S. There's no keystoning - I just had the camera at an odd angle.
