The bench is definitely busy now. But it's closer to the test setup I wanted (short SMA cables going to the big scope and the long 2.92mm cables to the BERT).
Still quite a bit more firmware dev to do, plus eventually reworking those two busted input buffers on channels 2 and 3.