Yes it was all of these things when the film was made... but if a forth film becomes a serious proposal then these nods may become something more substantial.
Bringing Xavier back is a mistake in my opinion. He got a big send-off, and his beliefs and lessons are being continued through his students. It would have been better to save Cyclops, who left in a far less resolved fashion. His return should have been in time to end the Pheonix story, but there is still room for him to be important and grow. I would have liked to see him fulfilling his promise to the professor from X1 and take charge at the mansion, put his relationship to rest with a scene at Jean's grave, and maybe even clear the air with Logan. I doubt he'll return though.
I think the cure has to "wear off" in a 4th, for Rogue's character in particular. That allows for a lot developments: expanding her powers and having her come to terms with what she is. It would be a nice statement to see that these people can't be "fixed". That to me is an interesting arc, and not a mere retcon. I'd be unhappy if X4 didn't capatalise on this at least.