My chosen solution to all this is Dendron. It's not perfect yet, but I found it better than the rest.