I totally agree with those five things! Your point about Scott being in the future as a kind of grounding moment is a really good one - I'd only being thinking about it in terms of a treat for the audience (apparently one of the screenwriters, Simon Kinsberg, felt really guilty about killing him off in X3) but that makes a lot of sense in terms of Logan's character. Also, in terms of him seeing Jean as a kind of death vision in "The Wolverine".