Ok, so still not happy with the car. Still got the EML on, and sometimes it wont start.
So, I took it back to my mates garage, he took it elsewhere to get it on a "proper diagnotcis", which apparently wont miss anything.... So It came up with the following:
P0341
Camshaft Position Sensor...