I agree, but might expand it to the addresses of all of the beneficial owners; e.g. 25% or more. (The regulation acknowledges this possibility, but I believe your CIP should reflect it as well.)
The address of the incorporating attorney means nothing in terms of CIP and, perhaps, anything else.
_________________________
In this world you must be oh so smart or oh so pleasant. Well, for years I was smart. I recommend pleasant.