Well I just spoke to RTCC and they are going to sort the issues for me, so thats a big relief!
Must say they were very helpful, so fingers crossed it doesn't take too long, I am secretly hoping they ask me to take it to Allon White my local dealer - I don't really want to be without her for a few weeks!