I would any day go for modifying it rather than just fixing it. If you have a broken headlight I would suggest taking it as an opportunity to jazz up the face of your car with a different pair of headlights. In my opinion, go for projector headlights with LED DRLs and at the same time change the taillights as well. Since it is plug and play, you will not have to cut any wire or make any changes that will void the warranty.
