Also heard about fitment issues. Some are harder than others to lock (and unlock) but that's all part of the game with some aftermarket parts isn't it.
Best options is like others have recommended (thanks to you guys btw). Either a set of Litronic headlight, although not cheap, or the bi-xenon retrofit. Both greatly delivers far better lighting performance than halogen - and shaves off 10 years from the car - appearance-wise
Sent you a pm
(congrats on your new roadster acquisition!!!)