Cadenza in right hand, metered in left

[Knute Snortum]

Hello, LilyPonders.

I am engraving Chopin's "minute waltz" and I'm having trouble with the last few bars.  Chopin writes grace notes with no bar lines in the right hand but metered bars in the left.  I have gotten close to what I want, but the right-hand grace notes show spaces where the bar lines would be, and I want them to be completely smooth.

I've attached my source file and two PNGs, one with the source file's output and one that shows how I want it to look.  Any help would be very appreciated. 

--

Knute Snortum

minute-waltz-cadenza.png
Description: PNG image

minute-waltz-cadenza-ideal.png
Description: PNG image

minute-waltz-cadenza.ly
Description: Text Data