Depending on what I'm doing I use a Lowepro Slingshot, Lowepro Mini Trekker or (if I need the kitchen sink too) the Tamrac Cyberpak 9. The Tamrac is the only one that will hold just about all my gear, but as I no longer lug a laptop round with me Alex's observation regarding the extra thickness is quite valid. But if I buy another bag my wife will beat me to death with it
All I can suggest is find a shop with loads of bags and spend an hour or so looking for the one that will suit your needs. However, photography being what it is you'll probably be in the market for another bag in a year's time