Thanks for your comments and pointing out the typo!
As for our estimate, I completely understand your skepticism. There is some work happening that makes me optimistic, and I believe that if and when quantum computing becomes more realistic, the immediate focus will be on finding an initial, practical solution. Time will tell.
From your 2 phases, we are definitely planning to push for the first one, as address re-use is a bad practice in general, and there are immediate solutions for the short-range attack. If this document motivates people to be more careful, it will already be a win.