I'm in a similar situation, have you found an answer?