Mark,
I would get your prefered choice to match the lowest price. GP must have lowered their price because they quoted me £1900 back in March plus transport on top... maybe they were trying to make a little bit back from me for all the times I made them come and collect the car to fix little things that their incompotent mechanincs could not sort out (under warranty) the first or second time.
Stratstone matched the GP price and included transport and C car, and I was very impressed with their professionalism and thouroughness.
In fact restored my faith in Ferrari Dealerships to some extent.