Oh yes, Asami and Korra will have their talk when they all reunite at the ruined arena.

I have a feeling after hearing Mako's side of the story, Bolin is gonna want some space and maybe when Asami and Korra talk things out, Bolin and Mako could?