I just use IPE. It's a nice GUI diagram editor that can save as PDF (as in, the PDF contains the IPE data). Far better than faffing around with tikz.
http://ipe.otfried.org/