Hee, hee.
Ok, attached is your first variation. I do agree with you that the second variation (which is what you suggested ages ago) is probably the better bet though. The only thing I had against it was ending up with a more "vertical" dialog. However thinking about it now it really wouldn't be that much taller.
We shall see what I end up with when I push 0.6... haha. The plumbing is all done supporting all the various permutations etc, I just need to start tuning the implementations of the algorithms.
@dwanthny - thx and I agree that of the two I originally presented the one you picked was my preference too. However I could be swayed into the second of chaley's suggestions. I just think with the approach I have taken the brain has to do a little more cross-referencing (particularly when stripping out the second row of titles). It is more concise in layout, but perhaps at the expense of ease of use.