So, this suggestion is really simple and almost not worth doing but I kinda see a need for it. With other Pokemon, you can nickname them and then if you name them what they are (Ex. naming Charizard "Charizard" sets the name back to normal) they'll go back to normal without the bar on the right saying "(Charizard)" With anniv. Pokemon though, that dosent work, so my suggestion is simply that you should somehow be able to restore an anniv. Pokemon back to their original name (Ex. Haikou Gardevoir)