Again, why compare the two pieces! You are comparing apples to oranges!
Of course it is the Waldstein that surpasses the Moonlight. No doubt about that. The Waldstein is perhaps one of Beethoven's most difficult sonatas. This is a piece pianists play for major competitions as well as for their Carnegie Hall debuts. Very challenging.
Additionally, always learn a whole sonata, and never leave out any movements.