To the OP: I can wholeheartedly understand how even the tiniest things can interfere with happiness...do whatever would make you happy!
My mother once had a house custom-built and for almost a year after it was finished she would have contractors in and out repairing tiny flaws...2 years later she sold it and had another built the way she wanted it.
Currently: 2015 Porsche 911 GTS and 2016 Cayenne S eHybrid
Past BMWs: `05 645CiC; `07 650i; `08 M6 convertible; '08 135i; `11 750ix MSport; `15 M235i convertible
Others: '11 Panamera 4S; '13 Boxster S; '13 911 C4
"You think that's air you're breathing now?"