In the real world shops are not points, because they have an extension. If we have a reliable source for their extension we can map them as areas; if we don't have it, we map them as points.
As you yourself recognize shops are inside buildings, therefore the shop nodes should go inside buildings.
You say that you do not want to add additional elements but you are mixing shops and entrances, here (https://www.openstreetmap.org/changeset/163411316) you have even duplicated a shop just because it has an entrance on another street.