Maybe there should be a toggled choice for the default of how an edited note appears on your timeline. Ie
'always show original' or 'always show edit'?