Your first semifinal program is fairly good, but as you might know the Waldstein is very, very widely played at competitions/auditions.
Make no mistake, if you can successfully perform the Waldstein, then you're doing better than 99.9% of your jealous competitors. If you enjoy this piece, I say go for it. Of all the pieces you've listed, this is the crown jewel. It is very likely one of the top 10 piano sonatas ever composed -- by Beethoven or anyone else. People become fixated with Beethoven's final 4 sonatas, which is fine, but this obsession tends to do an injustice to this amazing sonata.Chopin's Ballades are also sure-fire masterpieces of the highest calibre. Your other selections are acceptable.