I sort of suspect what will happen is small time manufacturers will come out with sealed battery packs designed for specific applications. I.e. I want to electrify my Supra, I'm gonna buy it from a shop that makes them specifically for my generation of Supra.
I'm imagining the same thing, and I imagine we'll eventually have battery cell inter-operability standards for cars that make that even easier.
In the past we didn't make it mandatory to have engines be easily swapped to other models of vehicle, but I think we're more conscious of re-usability and the long term lifecycle of vehicles and part of making sure that's efficient I feel is making sure I can take a battery pack from a crashed 2025 E-Supra nd put it in my 2032 E-Skyline.