Finally got hold of the dealer today regarding changing from a 2.0 to 3.0. The bottom line is that if I want to swap I have to start again. Currently delivery dates for 3.0d at my dealer is Feb 2012....
Having waited since Feb already I am not entirely sure what to do. I would prefer the 3.0, but not sure I can wait for another 7 months...