I am facing the same problem / solution. What did you decide to do?