Thanks everyone.

I ended up going with DipTrace for now. As manax said - I agree creating components is a bit harder than it probably needs to be, but the rest of the software seems very clean and easy to use. I'm running it on an old XP laptop and its sailing smooth. Thanks for the suggestions. Much appreciated.