New take: Editable notes should be a different kind of note event altogether, for people that want to use that. Kind 1s could be left as is, we don't necessarily need to merge the two.  

 Indeed, a “Diff” kind would allow client devs to morph previous notes