I do want this generation to end, but even putting my (fairly justified) bias aside, your suggestion would be too little and too late by next year. XY with better post-game content wouldn't be a "mostly new game" in any shape or form. Besides, fixing XY shouldn't be a priority compared to the 20th anniversary and utilizing the New 3DS.