I think it has always been possible that it would be Henry since he drove by on his bike right when Rumpel arrived. I don’t think the writers remember the whole Henry will be his undoing prophecy.
That’s what scares me….which is too bad because if they did remember, it would be an easy way for them to say they had this planned all along which we know writers love to try and pull (they are LOST writers after all).