Hi, and welcome to OpenStreetMap! Since you requested a review, I looked over your changes here. Looks great! The tags you ended up on (addr only) are perfect for this situation. Thanks for your contributions!