Cardiff Car Sales

First off can I just say how much I hate cars!! I know very little about them and we seem to have nothing but trouble with them We bought a car from a garage last August. It was used but very low mileage for the year, two owners, full service history and immaculate. We've had so many issues with it!! The day we went to collect it as the Garage owner was pulling it out someone reversed into it and broke the back light. When we got in the centre console display wasn't working. It had been working when we viewed it. The garage kept it a few days and replaced the display and fixed the lights. Then as we drove it home it cut out whilst driving. The garage owner had to come and put a battery pack on it to get it back together garage. Some belt had snapped and the battery hadn't been charging was the explanation. They were massively apologetic, gave us a courtesy car and replaced the battery and did the repair. From there on we've had niggly issues here and there such as the radio cutting in and out, one window being temperamental. Each time the garage has fixed the issue apparently! The centre console display also started blacking out again! Then it started losing power and just cutting out while driving which was obviously super dangerous. We reported the issue and they asked us to have it looked at by our auto electrician who found an issue with the fuel pump sensor. It went back to the garage and they changed the sensor. Issue resolved for a while and then came back. Garage took it back early December to look at all the issues. They replaced the fuel pump which didn't resolve the cutting out issue. They are now saying that they have fixed the cutting out issue (not sure what they have done as H has been talking to them). They were holding onto it to fix the centre console display. They put a new screen in but then said it was faulty so were waiting on a part. Today they've said they cannot find the issue with the centre console but instead want us to collect the car, get it diagnosed ourselves and then they will repair it. They've had the car since beginning of December so if they can't find out what's wrong with it I'm not sure why they think we'll be able to. I don't want the car back. I've looked into our rights and feel like we have some protection under the Consumer Rights Act 2015. Am I right? We wouldn't have bought the car with a broken console display, evidenced by the fact we insisted they replace it when we went to collect initially. If I'm reading the CRA correctly we have the right to ask for a refund or suitable replacement car within 6 months providing we have given them one chance to fix the issue which they've obviously had! Any advice gratefully received