Я перевел как: "We had been living in the country for two month when we learned that our old friend was going to visit us whom we hadn't seen for twenty years."

В учебнике было: "We had lived/had been living in the village for two months when we learned that an old friend whom we had not seen for twenty years was coming to visit us."

Правилен ли мой перевод? Можно ли было в таком порядке расположить придаточные предложения? Подскажите, пожалуйста.