Have you considered transposing the speedometer and tachometer? The speedo readings will be visible up to about 60mph, the range that will stop you getting a ticket. The tacho ones will be visible all the way round but to be honest with that engine on the front you have a pretty good idea what it's doing just by the noise and vibrations, the tacho is just for confirmation. If you calibrate the speedo then it will be worth looking at that as well, rather than being 6-8% optimistic. Is your oil gauge in the middle for pressure and temperature, like the SPA one?
I have indeed thought about doing the swap but have not asked what is involved. I could guess that it is a rather simple matter of removing the firewall panel, unplugging the components and then remove and replace the tach and speedo, am I correct? Or did MMC use a wiring loom that means none of the cables are long enough for the swap?
At the same time I could figure out how to turn on the dash lights to bright for daytime use maybe without the main lamps on.