Same here. Battery duration declined since Diablo. In the meantime, my original charger has died, and I'm using a cheap third-party replacement, it does the work, but I'm wondering if it's not at the expense of my batteries' lifespan.
With so many factors affecting battery life, I find it difficult to determine the cause of the poor performance.