Answer:
The wording of the two official interpretations paragraphs you cited is very clear. You are correct in thinking that you disclose both property addresses. The loan purpose (purchase of new property secured by an existing property and by the property being purchased) is irrelevant.
Your question is a great illustration of why an understanding of Regulation Z (and many other regulations) must include an understanding of the official interpretations or staff commentary to be complete.