Similar experience, similar conclusion but I ended up with a system around todo.txt. A note gets an todo entry and a reference to a note (in markdown). Updates sometimes get a new todo entry w/ link to the same note. Some notes are structured in a diary-like fashion.