It's worth getting your dealer to check the key to find out when it's due for service as it runs from build date not from first registration.Mine was registered in september 2010 but is due it's first service in July.Who remapped your car and what are the BHP and torque figures now?
mine went in for its 2 year break oil change (from manufacture not registration) and ended up having its 1st service even though it was showing 5K miles left, so 15K. Not impressed but they said its distance or time and they did it without asking. They did do a deal though so all ok again for another 2 years or 20K