Aligning offset quintuplets and triplets

[Knute Snortum]

I'm having difficulties with a Scriabin etude I'm trying to engrave.  I've
attached an image of the first few bars.  The challenge is that the first
notes of the offset quintuplets and triples should line up at the beginning
of the beams, but also at the start of a new measure.  The snippet below
alings the notes at the start of the measure and is "mathematically"
correct, but the notes at the beginning of the beamed quintuplets and
triplets do not align.

\version "2.24.3"

rightHand = \relative {
  r2 \tuplet 5/4 4 { r8. e'16[ e  e e e] e[ e |
    e e e] e[ e  e e e] e[ e  e e e] e[ e  e e e] e e |
  }
}

leftHand = \relative {
  \clef bass
  r2 \tuplet 3/2 4 { r8 r c'[  c c] c[ |
    c c] c[  c c] c[  c c] c[  c c] c |
  }
}

\score {
  \new PianoStaff <<
    \new Staff \rightHand
    \new Staff \leftHand
  >>
}

I've attached the output of this snippet. I can adjust the
NoteColumn.X-offset of the notes, but this offset can change from measure
to measure.  Is there a smarter way to do this?

--
Knute Snortum