Thank you for reverting back to the old version. I agree with the re-thinking b/c, in my opinion, there was just something not quite right with the new layout/strategy. It seemed to go in a good direction in some ways, but in the wrong direction in some other ways. Sorry my analysis is so vague; hopefully you tons of specific feedback to figure out a better overall strategy.
The only specific problem I saw, was the accordion style did not fully expand a selection, thus requiring another click, which countered the whole "less clicks" goal.