Like comma said, I would recommend 1-2-3-5 rather than 1-2-4-5 in M. 31. If it helps, I use 5-4-2-1 in M. 30 and 5-3-2-1 in M. 32. In M. 35, I saise my wrist as my hand goes from A->E->A->C#, then lower it for the next A. In M. 36, my wrist actually stays at a pretty constant height. You should exaggerate these motions when you practice slowly.
If it makes you feel any better, M. 30-36 are probably the hardest of the piece for everyone.