I know it can seem like a futile process, but have you tried the newest version (the ones with the paper labels and/or the shield instead of the saddle)? It smells like it used to smell to me about 20 years ago and the floral-y/musk-y basenote that was overly present over the last 15 years has disappeared, at least to my nose and chemistry. Pick up a .5 oz bottle when the holiday crap comes out at your local box-store. It's worth a shot anyway.
Thanks for the advice. I will!