I'm in the process of upgrading my headlights as well... and I'm with you Cpuken, there is so much crap out there that you don't know what you're getting... Prices vary so fricken much and the quality of the stuff is so different.
So I have decided to buy the the whole set from Bavauto.com at the end of the month, the price, $1500 plus shipping... These are Xenon plus angel eyes and according to them there is no modifications what so ever! Just plug n play... I know it's a lot of cash but I just don't want the f-around with it!!!