I've done my best to remap the misc fixes I made, but left the shop tag intact. I discussion still needs to be had, but more so in the form of a tagging proposal. Life is busy though so unlikely to happen.

https://www.openstreetmap.org/changeset/145346083
https://www.openstreetmap.org/changeset/145346332
https://www.openstreetmap.org/changeset/145346291
https://www.openstreetmap.org/changeset/145346259
https://www.openstreetmap.org/changeset/145346209
https://www.openstreetmap.org/changeset/145346164
https://www.openstreetmap.org/changeset/145346145