It's been pretty well established by now that aftermarket headlights do not do as good of a job as the OEM ones. This is true for 2Gs at least, not sure about the 1G ones that people got in the group buy.

I would definitely try to polish up the ones you've got before buying a new set of potentially inferior lights.