It really looks like a good list to me. Good quality scents, a range of different ones, and best of all ones you've researched and even tested. Having tested and figured why Versace PH is better for you than Chanel Allure Sport is exactly the king of nose using the scent hunt is all about. Huge scent rewards come to anyone who follows your example in this experimentation and testing.
Armani Code might be too popular, yes. But it smells good. I smelled it on a guy some time ago, asked what it was, and was really impressed. I can't think of anything to exactly replace its effect, but I think in the category of general all purpose scent for any day any occasion anything, which is what Code fits, I'd replace it with a traditional men's edc style neroli or citrus scent. Maybe Roger & Gallet Extra Vieille, maybe Givenchy Monsieur, and maybe Dior's Eau Sauvage.
Also, I used to wear Chanel Allure Homme and like it, but I think anyone should be really careful with it. It wore me out to its sweetness. After wearing it a few weeks or so I was suddenly sick of the sweetness I found so cloying suddenly six or so hours after I put it on. I couldn't wait to get it off me and retire the bottle. Lots of people don't have duplicates of this experience of course, so you might love it forever, but since I'm writing I say be careful and make sure you like it on you for a full six hours 'cause it can strike me as dreadfully redundant.
Also for new collections I usually advise people to look to add a scent from a different era, something from some time ago. I'd tell you the same thing. A wardrobe should have different years represented as much as different categories.