Interesting, maybe there are two factors at play - In coming to my conclusion I was thinking about a common fan theory that Harry Potter would voluntarily die at the end of the series, which would certainly be a departure from how he was introduced as the 'boy who lived'. But your analysis makes a fair bit of sense in the context of plenty of other fan theories I've come across...