Who is akira uehara's real partner in "my barbaric girlfriend?"?

i'm so confused about this story. i know akira uehara and nanako momoi exchanged their bodies. as nanako momoi becomes a boy, she dates her best friend makoto shiina. while akira uehara dates his best friend, Shinnosuke Senbongi. but i know that uehara is still in love with momoi, but momoi is already dating shiina, and uehara seems also inlove with senbongi. now i'm asking you, who is uehara's real partner in the story? and who will he end-up with?