I'm an Adobe Community Expert for ADDT and I share your frustrations. The Includes from List is something that I dearly miss the most. Unfortunately the closest thing currently is to use templates. I know ... it hurts to say that.
There are some other non-dreamweaver apps around on the web if you search for Ajax Master Pages or Spry Master Pages. I have not tried any of them though.