Now you dont have issue of warranty. So you are not bound to dealership. Go to a good mechanic and buy your own lights. There is a lot of good stuff in the market. Check this one
But be careful during installation. Instead of using tape buy some heat shrink tubes like following
But measure the size (Width) of the wire you want to use, If you dont know its diameter. Get a rough size by a transparent ruler. Buy heat shrink 30% larger than the size of wire. Better to use double layer on all joints.