I would move the story to 2029
Just 5 years. Xavier would be 96 years old. Given the fact cinematic mutants age slightly slower and better than humans, it's not that big of a deal.
Maybe THE WARP just guessed. The Chrysler Logan drives is a 2024 model, as stated by FOX, but the story is placed few years later.
---------------->
The X-Men timeline was altered 2 times, not just one (DOFP).
FIRST CLASS was already a "divergence".
Everything is explained here:
THE X-MEN CINEMATIC TIMELINES
http://x-continuity.blogspot.com