Yeah, that's what I think. Kirk would buy him a beer and they'd have a laugh over the whole cupcake thing. Kirk is a team builder. That's his best leadership quality. That and his intuition. Both qualities Spock lacks - which is why even Spock saw the logic of following Kirk.
Happiness, at least, Sir.