ED30 mate, all the way, The xenons are a nice extra, however I don't like the leather seats at all.
The ED30 has so many nice subtle extra's, colour coded front, skirts, bumper, nicer seats, stitched wheel, gaiter and handbrake, and nicer alloys too, And if you really wanted to you could put xenons on for a few hundred £. I think they hold the value better than a regular GTI too.