You can upgrade to CE any time through the mogstation and get any past, preset, and future rewards (even the PS4 ones).

The Chocobo mask will probably return as a new achievement reward at some point. There is quite a bit of chocobo-related content in the works.