What you have mapped looks fine. We typically map the building and business separately (in the future, the bicycle shop may get smaller / relocate and the buildings revert to being separate again).

If you wanted to be super detailed, you could add entrances to the buildings and label them appropriately (entrance=main and entrance=secondary and name=*). See https://wiki.openstreetmap.org/wiki/Key:entrance