We got the 3M kit. We used some 00 equivalent Scotch Brite sanding pads on the 3" pad in the drill for starters. That made a huge difference in the instructions and allowed us to skip the first 2 steps. Then we used the finish pads and polished and sealed
Buff/polish is the cheaper way to go. But if you want new or you just don't have the time, I recommend OEM (Sylvania) or TYC. The TYC are china made lights, but they are really the only aftermarket ones I'd use. The price of OEM lights have come down quite a bit recently, though, so I wouldn't count them out right away.