Short answer; Cyclops
Long answer; Both
This is a story arc where Cyclops is a heavily featured player, and as such, should have had an important role, even if the actor had limited time to shoot, and the character could only have limited time in the film, it should have been important. Not killing him off.
On the same token, Storm has been portrayed inaccuratley in both films thus far, and needed her character to be improved as well. Storm is a very vital character to the mythos, and should be a major player.
IMO, the focus characters should have been Wolverine, Cyclops, Storm, Beast, and Jean
Wolverine, because he's the poster boy for the X-Men
Cyclops, because he should be the "hero" of the Phoenix Saga, playing the role of Jean's savior
Storm, because she (as is being displayed in the movie) should take leadership when Scott leaves the team after being overcome with grief
Beast, as the political voice for mutants, and the way to tell us about the Cure story arc
And Jean should be self explanatory
Sounds like a lot. But I think it could have been done. Afterall, we are getting 4 of those 5 major roles. It just so happens that Wolverine's role is big enough for 2
