I am way overthinking this

This is exactly why I deny the existence of canon and utilize instead the concept of sources. I say use the source you prefer, or that suits your story best. If you're afraid of alienating a reader who isn't familiar with the source, note the source in the headers.