Sadly the 05 lights won't fit an 04 properly unless you also replace the fenders, hood and bumper with 05 parts. Your options are limited on new replacements since they don't sell new OEM's anymore. The eBay aftermarket lights are generally crap so I wouldn't even go there. My suggestions are:

-See if a professional can buff the headlight lenses back to clear and have them professionally clear coated so they'll last for years. This would be my choice assuming the rest of the light assembly is in good shape.
-Look for used 04 lights in good condition using Google.
-Buy a crap pair of OEM lights with good lenses and replace the yellow lenses with the good ones. This option scares a lot of people because you have to "bake" the headlight in the oven for a bit to soften the glue enough to get the lenses off. It's way easier than it sounds and when done correctly works fantastic.

Good luck and let us know what you decide to do.
-

 

That's my suggestion as well, or do it yourself. I did mine last year and they came out great.

 

You can also buy some aftermarket headlights then have someone do a proper HID projector retrofit. You'll have to keep up on the lenses because generally aftermarket lenses fade even faster than OEM but if you hit them with some polish the instant you see any cloudiness, then use a UV protectant over them, you'll be fine.

 

was this with a rubbing compound?

 

It was the 3M kit with three sanding steps (one wet sand), and then the rubbing compound step. That was followed by applying Sylvania UV blocking clear coat.