Hi, glad to see your edits here! (Mapped around here and downtown myself on a visit a while back). I think tagging the separate units is OK, but would suggest not also adding the polygon for both (inflates the number of buildings here). Would also suggest adding the addr:unit=1 tag to the westmost building, and addr:unit=2 to the easternmost one, as you had noted.