do you want to retrofit the OEM lights or go with aftermarket ones??

for aftermarket, I'd recommend: xenonfactory.com

I've used them before for my MC lights; they rock.