If you want better lights:
Your first step should be to do the rewire to use relays rather than pulling the power for your lights through those tiny wires that run throughout the car.
The second step would be to upgrade those lenses... and no... the diamond cut lenses are NOT an upgrade - even though you paid money for them (and I'm sorry you paid money for that crap - I have a few "upgrades" you could purchase if you are that into throwing your money away). We're talking about a QUALITY upgrade. The only option available on the market today that is worth anything is the Hella E Code lenses with a QUALITY H4 bulb. And no... again we're not talking about some "hyper", "extreme", or any other gimmic that goes before the word "White" bulb you found on Ebay. Go get a nice Sylvania H4 bulb from your local auto parts counter.
If you've done both of these and want to continue further down this path your only other option is custom.
But be careful. Don't take the cheap and easy route here. You're not only taking your life into your hands... but also the lives of those driving around you. If the lense is not designated as a main beam then it should NOT be used as a main beam. Do you think you have more brains than those guys that "DESIGN LIGHTING FOR A LIVING"? There are very few options available for making your own headlights. These are ALL already headlights for other cars. NOT fog lights... NOT driving lights.... HEADLIGHTS!
Good luck.
Oh yeah.. and if you put the terms "HID" and "Retrofit" in the same sentence (other than to say DON'T DO IT), please stay FAR away from me (and probably the local law enforcement) as this is not only dangerous but also illegal.