I agree with this whole comment especially wanting Asami and Korra to remain friends no matter what happens. And I like Mako with either girl but at this point I actually kind of hope he stays with Asami, but whatever. I am sick of them milking the whole romance thing and building up the drama to feed the rabid shippers rather than having the characters put that aside for the sake of their mission.

I do think Mako kissed Korra back, which was bad. But to be fair, he was caught off guard and probably didn't have a clear head. Korra should have known better than to kiss him and I think it was a big no-no, definitely NOT cool, but like you said at least she backed off when he told her to.