Couldn't you fix the 2% with some aftermarket mods? You could essentially have a high sport, though sans warranty.
It seems you don't mind having your eggs scrambled. Did you consider the 458 scud? I had a deposit on one that I moved to the 12C. Not sure my dealer would have come through in an acceptable timeframe anyway as I am not a big fish.