I have two suggestions for APOCALYPSE:
1- Make Charles mention his comatose twin brother. This way, X3 and DOFP will be "vindicated" from this point of view.
2- Address the fact Moira MacTaggart "CIA Agent" has a daughter named like her.
And we should be over with it, LOL.