My two tools of choice when it comes to diagram are
And I'm always interested in learning about better tools, hence I'm eager to read the other answers! (Many people like Lucidchart, which you might give a try, although in my use-cases, it's kind of in-between Omnigraffle and VP)