Katan,
1.Rav Chaim Vital specifically refers to our oath just before saying that :”the oath” is only for 1,000 years.
3. The answers to Rav Aviner are not answers. For example, he asks why previous generations did not try to conquer EY if it is a mitzva in our time. The answer is simple: they were anoosim. Jews did not receive military training and were barredfrom owning weapons. Thus whenever a riot broke out they had to beg or bribe the local nobleman to protect them.
4. The thesis of “Kol Dodi Dofek” is that Hashem has knocked.