You Won't find any bulb swap for the angel eyes that will keep up to the newer style rings....its the limitation of the optics and current tech of the source.

Do the fogs right, get a set of projectors from the pre-facelift X5's and swap a set of HID's into those. You'll get the kind of light you're after with the proper cut-off. There's a DIY of it kicking around here somewhere. Dig it up an you'll see what I mean.

__________________