I would plan to put the headlights back where they belong, for cosmetics, cooling the engine and not cooking the headlights. The fish tails are pretty. I might have to drive it with them for a while to decide if they are worth keeping or not. I assume from what I have read that a May 2018 build should be built pretty much to current specs. Are there any big changes in the last 18 months? I understand that this is a hand built English car with an engine design from the 1930s so I don't expect it to perform like a Toyota Camry, but it sounds like the recent M3Ws have significantly improved. Has that been your experience? Just FYI, I also have a 1981 Fiat 2000 Spider, a 1964 Honda C77 Dream and a 1976 BMW R90S in my garage so I am accustomed to the attraction of and occasional challenges of unique vehicles. The M3W's quirks are part of the charm for me. Any advice would be appreciated.