Eau d'Hadrien has been hit by IFRA restrictions, as all citruses and mosses, and had to substitute ingredients. Have you tried the one in the new bottle? (not that it makes much of a difference).
It's hard to have a long lasting citrus. AdPs are good, but they aren't natural either in the drydown. I like O de Lancome (the original one), which however becomes green in the very pleasant drydown. If you do without the drydown and are just happy to spray over and over again, there's the wonderful Chanel Eau de Cologne.