If still within warranty, then a tuning box such as the DTUK is your best bang for your buck. You can simply unplug it when it's servicing time.
I bought mines 2 years ago for £350, and it's the best decision I made. Once connected, which btw is very easy to do, you can control all the relevant...