If Asami and Korra can bury the hatchet (rather than take Mako out with it) Mako better not be in the same room. If anything, their beef with each other thanks to Mako, if he's around, it wouldn't be very helpful. And Bolin needs to man up, he'll probably just learn to stand up for himself, which he needs to do.