Quick update - had the car out tonight and it drove good (engine warmed up and tuned). But I pulled in to a petrol station and I could hear the fuel pump making more noise than usual and then the engine cut out. It restarted no hassle and although the pump was still noisier than normal it didn't cut out. Pump on the way out?