I agree with your assessment of Solas' arrangement, Leeneia, though I am a Solas fan. My favorite version is by Laurie Hart and Paul Marchand on Cobbler's Dream where it follows Derriere Chez Nous (can't find a link). She describes it as a 3-beat bourree and it sounds like and uptempo waltz. Funny, I can't find a version by Chabenat.