First off. Spoilers much about the X-man ending? I haven't seen the new one xD.
Secondly I've got to admit that I'm one of those guys who don't read the comics and only watch the movies. The only super hero comics I have are a few of the ultimate collections of the amazing spiderman (which I think are FREAKING awesome) but I do love the lore behind Marvel heros and look at the wikis a lot (also have the marvel encyclopedia and have read it ALOT) but I gotta agree that the movie verses in most ways aren't quite as good as the 616 universe. 616 is the main universe right?