A quick update, after speaking to them, it seems that the offer they are making for my car is going to stay on the lower side, which I'm sure if I really pursued it and got the finance company back on board some how, I could negotiate the deal to be a bit more favourable, but I'm thinking that with all this work they've done, providing it is indeed fixed and nothing else comes up, I stick with the car. I'd be happy to keep it if the outstanding issues are fixed as it will be like the car I loved when I first got it, but maybe I should push for some sort of discount or deal on the warranty next year when it's up for renewal, do you think that would be a fair request for me to put to them?
When they made the offer for me the extended warranty was what the dealer expected them to make. I'd push for a further year and see where that gets you as given the bills these things can throw its worth it in my opinion...