Battery prices are still falling though, it's just demand is enormous. But I works fully expect China to start having "compatible replacement packs" being built once the volume is there to support it.
A logical future market is battery-refurbished EVs, just a question of where the crossover point is.