There are headlight trim rings available for our scooter. Mine is an identical twin to yours, and it too, has been very dependable....100% in fact.
Installing a set of 110/90-12's, at tire change time, would bring the speedo a bit closer to reality (they stand 30mm, or 1.18" taller than the standard 120/70-12). After doing this, my speedo is still a bit optimistic, but better than it was.....and the odometer is now almost dead on (within a couple of tenths, in 100 miles). This also gears your scooter a bit higher, meaning slightly reduced rpm's...which should improve gas mileage. Of course, the best way to do that is to just slow down.
There are many thousands of miles left in your scoot, if it's properly cared for.