Changed my mind on Giga again, and I think the last variation would sound better with broken chords and uneven rhythm.  I think I might leave of Prelude 4, too.