Deuter frame bag at the front for ephemera, tools in a 750ml bidon on the seat tube, 2.7l ortlieb saddlebag for clothes. Reasoning is
1. I hate top tube bags, as my knees hit them
2. Storing tool kit in the saddlebag makes the bike feel horrid out of the saddle, and we'll be out of the saddle a lot
3. Small saddlebag makes me think about what I'm carrying, which I never did when using my Nelson Longstrap.
I suspect my frame size 60cm is the sweetspot for the framebag, in that the straps just fit, and it's not in the way of the downtube bottle cage.
BTW, I checked, and I've got 34/30 to fall back on. Suspect I'll use it a lot.