Is there a way to switch shop type with the new shops? I accidentally made a shop where I need a gallery and can't find a way to edit it.

Right now there is not. I don't know whether there will be in the future, but for now you'll just have to delete the shop and create a gallery instead.