How to take multiple addresses and validate

I am working on an application where addresses will be validated before submission.

Steps are:

  • take address
  • validate
  • if address is correct, proceed
  • if address is incorrect, user will be prompted with few suggestions, user pick one address and proceed

The problem arises when user adds two addresses and validate. Ref to sample 2 where user wants to add a new address.

User can have two different addresses but the current system validates one address at a time.

I don't want to use popup for adding a new address as the same address component is being used in a popup and opening 2 popups is not viable. Toggling b/w address component may help. What are your views pls.

Sample 1 enter image description here

Sample 2enter image description here