I think we should leave the street as a primary, because it's still the "Hauptstrasse 2" https://www.openstreetmap.org/relation/304010 
Same situation occurs for example in Aarau at the Bahnhofstrasse.