Thanks for the info guys. An update: I have decided that I like the P1 so much (and the resale values are rubbish!) that I am going to keep it and buy it lots of presents inc. uprated brakes, droplinks, new exhaust system, bumpsteer and geometry checks.
After all that I will be looking to optimise the performance side.
Speaking of performance, is the next rolling road day being considered and are any dates in the pipeline yet? I would be keen to attend the next one...