I rest my case about serious mental gymnastics being required to try to stitch these contradictory elements together.
They do not fit and are not even telling the same story. Nothing will ever make them fit, no matter how much threadbare string and worn-out duct tape you try to wrap around them.
These repeated attempts at retconning remind me of a straight woman married to a gay man, who remains adamantly convinced she can make him be attracted to her despite all the evidence that this will never happen. The only solution is to let it go and seek happiness elsewhere…