Well, I couldn't stand it anymore, so I did the tank swap today. It's easy to say, a little harder to do. All in all things went very smoothly. Fish are in the tank, looking good, and eating. Tanks still a little cloudy, but getting clearer each hour.
Driftwood is being held down by rocks, so...