Thanks for all the input so far!
As for racks, I am having a hard time figuring out if the Tubus racks are really worth the price premium for me. My LBS recommend a Blackburn which would be less the half the price of most Tubus racks. Of course most cheaper ones are aluminum, not steel - any reason to go with one of the other?
Ortlieb has some nice looking products. Very interested in the Office bag and/or maybe a more traditional panier when need to carry more. Wish I could look at these at a retailer though, as its nicer to see/feel a bag then look at pictures and dimensions. Not really sure how large I need to carry things like a change of clothes and lunch.