Well if it goes the route you just named, this can still end on a great note for both parties. I'm down for Masami sharing a dessert AND/OR taking a dip, would you want Borra to accompany them in the savoring of sweet delights, having fun in the pool (which Korra never got to do because suspicions in Season 1), or just sitting in front of a fire and just talking? The options are pretty limitless, but we know Bolin and Korra would have fun.