Go with Eagle by ww.cadsoft.de
Lots of library parts, can down libraries from sparkfun, adafruit, and newark.com has lots of individual parts as well, can download after you register.
Bit of a learning curve. You can use an Arduino board as a starting point, extract libraries from an existing board, delete components you don't want, add in your own, leave the headers in place, etc.