I've been putting this off for so long I use to be able to vacuum my entire house 2,500 sqft ish (minus furniture, etc) with battery left over. Now it dies halfway through.

I might follow you and just get a Dyson branded instead of aftermarket.