I believe that Ultimecia wanted to compress ALL of time, so yes, all those events would be in the 'set'.
As for your theory, I can agree fine with everything you seem to have ended up with now quite fine(assuming I understand you correctly). All I didn't see was how the heck you reached the assumption that the year 2500 will also feel the effect...