Just my own opinion of course, but if it were me – hand on heart – I’d be returning the car and looking for something else. I just couldn’t be doing with all the faff, no matter how fond I was of the car. VW saying ‘We’ll be in touch if/when we find a fix’ would send me over the edge. What sort of attitude is that?
Good luck whatever you decide.