Ipe is absolutely fantastic! It's my go-to for any figures, and I'll only switch to Inkscape or Illustrator if I need to make a slightly more-involved diagram.