Yamato's creepiness puts a drain on his previously established badassness. But having a skill only a Hokage had is pretty badass too so he's still in the black.
I'm glad they took an hour to get all this touchy feely stuff out of the way though, having three full episodes of 'team building' in a row would have been god-awful boring.