I'd go with the 2003 > normal 20v turbo wheels.

The earlier ones (like you have) are awful aren't they! I had a 2002 with those wheels on and it was the only thing I hated about the car.