Richard, the curve correction tool did the trick - the curve is not quite a straight line, but not far off. I ended up re-printing the 21k-step patches, re-scanning - just to be sure - and then went through the steps you outlined. No need for a gamma or overlap tweak, unless I see some issues in the prints.
Nice to know I might actually make the exhibit deadline.