Just got this moving and posted an update on my original thread.
Maybe it can point you in the right direction - that said it’s ugly and has come caveats, so if your solution is currently working for you then I would probably stick with it.
If you want to tinker and possibly dig a hole you one day have to figure a way out of (like me ), then by all means proceed:
), then by all means proceed: