Gambit and Magneto were scrapped, but the Magneto Origins story was pretty much everything that happened in First Class but without the X-Men.
Next X-Men film does sound alot more promising as they are going to adapt Days of Future Past which has time travel, and Sentinels in it.