The two years run from your declaration to the Interior Minister, not from the wedding. A woman who was Egyptian before, or is of Egyptian origin, does not have to wait.