I would take a look at a messenger bag. I recently went to a Bailey Works bag with a padded shoulder strap. Much better arrangement of pockets and it can hold a large dell laptop with ease. But generally when I am commuting with the laptop I will use the panniers (atleast one).