I’m not sure if this does what you need, but as it happens there were recent, significant improvements in this area:
At the least perhaps you can build off of that with a Plugin or Theme Component.