Did Samson have a Sense of Humor?

Yes, I think he did.  Having that riddle about the Lion and the Honey, and then the irony of using the Philistines own clothes to pay his debt definitely has some humor to it. But I believe Samson missed a huge comedy opportunity when Delilah was trying to find out the secret of his strength .  I think he should have said things like, "If you fill this room with baboons, I will be a weak as any man." or,  "If you have twelve Philistine soldiers in this room, with grapes in their noses saying "Samson Sells SeaShells by the Seashore" over and over, I will be as weak as any man." Yeah, weak with laughter maybe. The bowstrings and hairloom were ok, but I think there was potential to be known as a legendary comedian.  Hmmm, I wonder if Samson's hairloom ever became someone's heirloom?