Rach's Prelude Op 10 No 4 - which edition for best fingering??

[sandracb]

I've been learning Rachmaninoff's Prelude in D+, Op 10 No 4. I'm starting to get more smoothness in the first page, but the second and fourth pages are a mess. It feels terribly awkward, and even if I memorize it I'm struggling terribly to make it smooth and bring out the melody. I've been using the edition found in the database here on Pianostreet.

I also have the Alfred Masterworks edition, which completely changes up the layout of the piece - it looks like it breaks up the arpeggio support between the two hands. Looks very strange!

Are there any fans of the Alfred fingering? Is it smoother and less awkward? Any other edition recommendations? Right now the fourth page is especially stuttery and choppy.