Jani, yeah, Humphrey's smell ain't all that lovely, but like you, I correct it. I have orange blossom water, rose water, and assorted EOs on hand, so I can come up with a nice range of scents with Humphrey's.
When I went back to the store, there were about 20 new bottles on the shelf and only two of the old ones. All were the same price, and I checked with the manager, who said they have a large quantity in the storeroom. I only bought two bottles. I'm sure it'll still be there when I need it next. And anyway, God help me the day I get Witch Hazel Acquisition Disorder (WHAD?) FWIW, I also bought one of the old ones and smelled it. Smells fine. Used it today, too. No problems so far.
Why should we not meet, not always as dyspeptics, to tell our bad dreams, but sometimes as eupeptics, to congratulate each other on the ever-glorious morning? - Henry David Thoreau