Forgot to mention that I spoke to a few people about the gearbox clicking and feeling a bit sloppy, it turned out to be a bolt that had come loose under the centre console! I gave it a quick tighten and I was back in business, can't believe it was something as simple :)