It appears that Macromedia has released Dreamweaver 3.

After a quick overview of the new features, I'd say it looks promising. It's got some nice tools for cleaning up MS generated HTML, will do in-line image maps, has more tools for collaborative work (including a place to keep development notes), keeps a history file (!), and uses XML as its custom menu and shortcuts file type.

It's available for a free trial, and will be shipping in mid-December.

More information is available at:
http://www.macromedia.com/software/dreamweaver/.