Nothing wrong with my Edition 30 .... but getting itchy feet after 18 months of ownership .... max £25K but could stretch to 28K if I really liked something

Dabbled with the idea of a VXR8 but can't find one at the right price near me - and the Vauxhall dealer nearest me doesn't seem interested!
Choices left :
1. Keep the Edition 30 and get a TBE / go to Stage 2

2. S3 with DSG in white (ex demo ... and then Revo it)
3. Focus RS in white in a few months when a few more are about and the silly prices have gone away ... with a view to remapping via Bluefin

4. Z4M Roadster (I've come from 6 years of convertibles to the Ed 30 so am used to the limitations space wise, etc).
Views welcome ....