I see you're also learning Ravel's Sonatine. If you've already mastered the first movement then the opening is the same technique (voicing a melody over trills). If you haven't learned this yet then I recommend spending some time with it as it's less demanding than Waldstein.