Never tried the programs you mention, but I did play around with this a few years back under Linux.. I believe it also runs on windows... Not sure if it will fit your needs, but here is the link:

http://hans.breuer.org/dia/

Good point is that it is open source (read: free) software...