Just a thought. Have you considered a removeable / switchable map system? I bought a device from Chipped UK (Bromsgrove based) called ST3, and I plug it into the
OBD port, switch maps as required and away we go. Gives me the option of standard map, economy, and fast road whenever I want to change.