Great answers as always, thanks everyone. Its as I expected - don't change it, wait for warranty to run out, save some pennies and fit the Williams GDi Kit which has had some excellent results.
As an aside Ill see a few of you at the MMC day, I'm one of the factory tour guides. Don't expect insider info though - we are all sworn to secrecy of what goes on inside those hallowed buildings....