When email comes delayed (with invalid token) can you white-list that particular sender? You'd then request another sign-in email that comes promptly this time.