I agree on both counts. It does seem like 6/8 is a better fit. And, overall, it does seem to me that there are a lot of things that don't seem to come up again. That doesn't go very much with the style of the work.
One thing I think you have to watch out for is the textural changes. Suddenly there are two-voice chords, suddenly there are 4 or 5.... You can do all that but I think it requires some kind of preparation.