Hey Andrew,
Thanks for the deep dive and vast amount of details! We’d be happy to work through the changes and get them integrated into mainline. There are some future facing plans to do a rework of the RigHierarchy in general but at the moment there is no firm timeline for this - so any improvements we can realize in the short-term would be a win. Do you have a stream within our depot to pass over a shelf, otherwise we could work with a diff or Github pull-request.
Cheers,
Jurre