Well, primary lithium cells are among the highest shelf life commercial batteries. If shelf life is important, why are you running on rechargeable?
I wonder if Eneloop NiMH rechargeables would be a good fit? Their self-discharge characteristics are pretty decent. 6 years is probably pushing it, I guess.