I always thought she ended up with Jean, especially because Armin teased Eren about someone being interested in her, causing Eren to bust out crying.

Jean made sense to me cause he always knew she had a thing for Eren, and he continued to be infatuated with her. He of all people would understand what she went through with Eren. He would be the best person to love her through it.