Nice! Thanks for clarifying. I think I’ll go with the tagging scheme you suggested.

Quick question though, should I remove the addr:housenumber=* tags I’ve already added, or would it be better to retain them and simply include the addr:block=* and addr:lot=* tags alongside?