It would be pretty great if Mako does stay with Asami, especially if they actually managed to have a conversation about men and women being able to be friends and worry about each other without it being relationshippy, even if there has been mutual attraction. I really want everyone to be friends, basically.

True, neither of them is totally without fault, but they at least tried to fix shit and didn't let things go anywhere. The things that are really causing the problem are, frankly, Tenzin's kids and Bolin telling Asami things in a sketchy kind of way. I'm totally cool with Korra and Mako and Asami having to have a talk where they apologise for not telling her things because she could be hurt, even if nothing really happened; I just really hope the writers don't act like this is a real infidelity plot instead of a plot about people making things worse by interfering.