Both were fantastic. That was the best promo in months. Punk I'd say did better since he had gold spun before Rock even came out.
I know Rock had some bad jokes, which is nothing new, and they were certainly bad and people might call him out on it. But the big thing is he takes that crap and makes it work. I'm no Rock mark but it's hard not to get you invested in his promos: he's incredible at controlling the crowd even with stuff as bad as 'Cookie Puss'.