I would recommend a hybrid: it's lighter than a commuter and it's an upright. It'll handle the varieties of road that a commute can produce, can take racks/panniers/lights etc for commuting but still ride lighter and faster than a "comfort" bike.

and of course since I'm a Trek-head I would always recommend Trek!