Quick update on this, since it's been a while:
I have a plan, but I didn't manage to get it done before the 5.7.0 update because of my ongoing health situation. I'm pushing the 'vanilla' 5.7.0 update without these changes first, but hopefully I'll manage to get something done for you by end of year.