Good stuff surveying them! The house numbers should be in the addr:housenumber field rather than name; where there's multiple numbers within a single building (such as https://www.openstreetmap.org/way/840095763) and if it's obvious which part of the building they belong to, then they can be mapped as an address point (for example: https://www.openstreetmap.org/node/3278598876).

The road names could also be added in based on where they are located.