After reading the manga, it does seem Gotenks indeed has a step or two above Buu. He's really taking what Buu has to offer and giving it back even better.
Is Buu holding back? I dunno. We know he's pissed. Sure, he's mentally weakened, but I dunno. Super Buu is on the losing end of the battle...