TikZ might be eventually useful if you have a lot of reoccurring diagrams for which you e.g. have to readjusts notations, I don't know, it looks to me like quite unhandy for more general purposes. I used Xfig in the past, but I wouldn't recommend it anymore. Inkscape is able to do latex and you might give it a try, if you haven't yet.