"it is doubtful that all the annotations should be considered canonically-recorded."
Oh, come on! I have no doubt that you should so consider them, with only minimal epicyclical rationalizations! I have faith in you. Just remember your mantra:
The Canon is Complete
There Is Only the Canon
The Canon is Perfect
The Republic Has Always Been at War with the Trade Federation Separatists
Freedom Is Slavery (from a Certain Point of View)
Greedo Shot First