I completely agree with you. I'm ok with any ending where we can have the oportunity to something romantic with him if we made the right choices.
And about your other suggestions, from my point of view all of them are very important.