As an added datapoint I did update to 5.0.0 and grabbed the lastest topos from github and there was no improvement.
I am happy to put up a small bounty if you or anyone else is able to dedicate some time to resolve these two use cases in a timely manner.