Just leave the retrofit kits alone. I've never seen one that looks any good, the performance will never be as good as a OEM fit Xenon setup. Regardless of how well an aftermarket set up is aligned, there will be plenty of glare.

Just make the best of what you've got, and when the time comes to change, buy a car with Xenons fitted.