So, decoupling battery from the car and allowing better competition in the battery space might fly. Car makers need not be bothered by the battery tech and can just focus on making good electric motors, since most of the car parts are from other vendors anyways.
However, the decoupling might not be all that rosy as Musk has demonstrated that safety is best achieved with total vertical integration. Even Tesla tried battery swapping but gave up.
This might work really well in 2 wheelers though. The existing bike manufacturers won't have to retool their factories by much to replace the engine with a motor and the batteries can be probably swapped in and out of the under seat space or something like that.