So in this future Magneto and Professor X remained allies and the events of X1/X2/X3 never happened?

Yes, but I wasn't told that it's stated those events didn't happen completely. But when you think about it, for these two characters to be alive and for Erik and Charles to be working together at the school, the majority of those events must not've happened again.