I've decided to use Sketch for the diagrams in The Meteor Book.

It's a pretty nice app so far, still missing a few features compared to Photoshop but I have no doubt that it'll be a serious competitor within a version or two.

keyboard shortcuts: previous shot next shot L or F like Z toggle zoom