I seem to be in a similar situation as you. How did you end up solving it?

Is there any progress?