Hello! You're absolutely right that using both amenity=place_of_worship and building=church is the correct way to map a church.
I did notice, though, that in this case the building footprints are overlapping with building w1424141771. According to the Simple 3D Buildings guide (https://wiki.openstreetmap.org/wiki/Simple_3D_Buildings), buildings shouldn't cross each other. This can cause rendering issues and incorrect data.
Therefore it would be better to map these as separate building:part features, or even as just a POI if it's a small part of a larger structure.
Thanks for your work on the map!