The correct way to fix this is to have NIP-57 dedicated providers that discriminate the receiver of the zap from the "p" tag in the zap request event itself.

All these zap providers need is a URL, static for everybody. And they can even begin accepting zaps on behalf of people before users actually go there and sign up with their Nostr key to withdraw. They can also just forward the zaps to users' lud06/lud16 addresses as soon as they are received.