Have you considered exclusively load shifting (no pv), and getting a powerwall/embedded-invertor type configuration which you could transport to a new house,
assuming, that with the battery usage pattern it maintains a good capacity after those 8 years, it's probably resellable too, if new property was already equipped.
That does rely on the differential between favorable night, and day, rates, with the likes of octopus, remaining; maybe other suppliers will soon be onboard and restriction of EV ownership 'relaxed',
more wind capacity coming online and limited supplier storage capacity investment suggests it will (private market and ev's monopolising lithium supply)
Unclear how any change in vehicle/EV taxation - mileage based ? might modify market.