I think you are being a little quick to form your opinion. Did you read the notes at the Barenreiter site? There are various sources. The location of the Menuetto variation and whether there is a da capo of the theme vary markedly among sources.Consider that finishing the variations with a menuetto variation and no da capo of the theme are typical Viennese conventions. If you are curious enough, you will find other examples (most notably a big Beethoven set comes to mind). SmileyI happen to be brushing the work off for a performance in January, so I will be making a decision soon myself. I am not sure what is the more satisfying musically. When I first learned the set as a teenager, I did the order as it appears in the pianostreet site.