Email this guy for updated headlamp units:
jezzb@aol.com
Here's a link to a pic of them. Very nice looking IMO:
http://986forum.com/forums/uploads01/LED31349282319.jpg
This route would be a lot less hassle and maybe less money too, plus, you don't have to worry about the glare from a retrofit kit.