Hi, just putting my two cents in :) I think Emma really cemented her not-going-to-choose-neal thing right after the cave, even if she didn't know it herself, when she said that whole thing about how she wished she could change how she felt and so on. To me that felt/sounded so final, like that was the end of their romantic relationship, but not their family relationship. But then Neal just followed that with "I'll never stop fighting for you" so idk.
for me, indeed, Emma seemed pretty done with him romantically speaking. but since they are family anyway I like to think that Neal will never stop fighting the image she has of him (aka the dude who abandoned her and sold her to the cops 10 years ago).
and this is the best we can wish for both of them, right? :p