darth_ender said:
Personally I suggest you stick just with self-reference. Like you said, the choppiness was off-putting for some, so you don't want to make it excessive, and the same goes for the joke. It's probably funniest just leaving it in reference to Obi-wan. But please keep it for himself.
^This.
Also, I second greenpenguino's suggestion regarding elevator music.