I think that we should not be adding points with just street/number, but also town and state. This is just making it harder to fix later since town and state belong. I don't understand why you think it is lower risk to omit town state; that doesn't make it more likely that the other data is right.