The problem has been one of note durations, as I recall, in a number of specific places.
As far as bars 12 and 22 are concerned, you have this pretty well conquered now: the 2nd chords in both of them occur at pretty well the correct time, i.e. the F#-A lasts the right amount of time before you play the G-Bb. You are stretching the duration of those second chords to make time to fit in the Eb-G grace notes that lead to the next bar, and that's OK provided you know you're doing it, in other words provided you are aware that you exercising artistic control, and that although this makes the beginning of bars 13 and 23 technically late, you have decided you would rather do this than make the grace notes sound rushed.
The only real remaining problem now lies with bars 10 and 20. You are not giving yourself time to let the music contained in them say all it wants to, and seem anxious to get to the next bar.
The first chords of both bars last the right amount of time, so that the second chords occur at the right time, but you cut these second chords short [by about 25% in bar 10 and 50% in bar 20], so that the beginnings of the next bars come too early [bar 11 by about one 16th note and bar 21 by about two].
Getting close... About the appoggiature, I prefer them like that. I did play them fast at one point, but did not like it too much.