Agreed with the sadness. My pragmatic take is that any improvement here needs to be incrementally adoptable and therefore compatible with the existing data structures - otherwise it'll be too hard to migrate.
I personally waste so much time on git rebases that shouldn’t even be a thing.