I had HUGE problems with the end of that movement, too - and then my teacher taught me that, when you have trills and big runs in one hand that freak you out, you should think about the other hand only and concentrate on the notes you are playing in the other hand. I stopped having any problems with any ornaments after that.
I don't know if that works for everyone, but it certainly worked for me.