Phelps!
I think she should have ended up with Christopher tbh. I always felt like they were meant to be and while her and Luke were great as friends, their relationship was always a disaster