Bundle Booking with Different Time Lengths

I offer classes that are multi-session with preselected dates and times. I know the bundle booking covers this situation. However, I have a catch. My sessions are not the same length. For example, if I have a 3 session class, the first session may be 3 hours, the second session may be 1 hour, and the third session could be 2 hours. The workaround I'm using is to still use the bundle booking and to use 1 hour bookings and force the first 6 hours to be selected. This kind of works, but is really clunky. Plus, this means it shows each hour block as a different product on the event calendar page, which is really confusing.