Getting Solar Installed should I get extra panels/batteries/inverters for EV Charger and Heat Pump

I’ve decided to bite the bullet and get solar installed for my property. My annual electricity consumption is about 3370 kWh and gas 12k kWh (combi boiler). We’ve got a quote for ten panels Aiko, sunsynk 5kwh inverter and 5.32kwh battery. Cost would be 7.5k. Am thinking of future proofing my property as would be replacing the boiler with a heat pump in around 5-10 years and potentially getting an EV car in about 5 years. Would it be worth upgrading to a 8kwh inverter, 13 panels and an extra battery? We’ve got a quote of around 10.2k for the upsize. Also, any considerations about being able to export more energy in the summer months with a bigger battery etc? The combi boiler is about 4 years old, still going strong and serviced every year.