Agreed. I thought theyd hit us with the 'he's so calm after watching the video because he know the tricks and provocations they're trying to play on him' and was surprised when he actually reacted angrily. Still, him snapping at Dan and reverting to his old ways because of this and generally the stress of the match makes sense.
MOST IMPORTANTLY, he recognized immediately that what he said to Dan was wrong

It’s pretty unrealistic for him to just completely switch to being lovey dovey and sweet. He’s spent 20+ years of his life acting like an ass as a defense mechanism.
Him reverting back to pushing people away makes a lot of sense for his character. That’s what his brain is most comfortable doing, especially when he’s in distress.
Don’t worry guys, something will happen that snaps him out of it again.