I didn't know it like that, but I agree that it's better. The version I first read in the early to mid nineties was much longer than this one though, and his achievements at quick wit retort just went on and on from one unbelievable accomplishment to the next -- which of course makes the punch line that much funnier. The version I remember was also quite elegantly written, which made the crudeness of the last line that much funnier.
Yes, that's how it should be.
Speaking of things that are funny to some and not others, an instructive example is the Orange Head joke. Usually when it's told, the audience is sharply divided into those who think it's hilarious and those who struggle to see what's funny.
Here's the Orange Head joke:
Do you think it's funny?
If you search for this joke's key words, you'll see many pages where, after it's told, people react incredulously and ask where the joke was. Others at the same time are laughing their heads off. Here's a blog post that attempts to analyze this, though it doesn't get far.
(I personally think it's hilarious, and easily the best joke I heard last year. When I retold it at my blog, I got many concurring comments, but also comments from people who didn't see anything funny, even after those who did tried to explain what they found in it. Several people went on to convince themselves it's garbled and there must be an "original" version in which the final remark makes sense and is funny - and offered several ideas of how it might go).