I am mainly interrested, if the OP´s problem was fixed. Describing my Setup is not required to know this…
I had a very similar problem and solved it. But that solution will only fit in some cases, depending on network topology. I guess you‘ll have to figure it out your own.