I used the Marco Spec kit, I think they pretty much got it right, there are a few things I would change, but that's just a personal issue with me. And it is totally cheaper than buying the lamps individually. I also got the DM kit from them, I like that one as well.
FYI, be prepared to send a lot of time doing the upgrade, it is a ton of lamps, and you need to pull the subway ramp to get all the new ones installed. I didn't do that since mine is routed and those lamps still work.