How about Op. 10 No. 1, third movement? It's so ludicrously dramatic that I can't help but smile every time I hear it. All the Op. 10s are really nice, and not played very often.
Since you are already thinking of Beethoven op 31 no 3, I might suggest the 2nd movement, the scherzo, from that sonata. It's a really fun piece. Also, I think it fits the type of piece you are looking for and would go well with your other choices.