Go with Option 1. You only need one pair, the angel lights are optic fibre rings. They are reasonably easy to install however many people (including myself) had issues with the plug and play. For some reason they conflict with the computer and can fail just as easy as the original globes not because of an actual filament failure but because of a chip hardware issue.

How good are you at DIY? The fool proof method which I used was to wire your option 1's directly into the ECU Red/Yellow wire and have them basically as driving lights through a Relay. Then you wire in a ceramic resistor into each of the original parking light harnesses to prevent the "Check Park Lights" message.

Here are some photos