First the easy one:
My headlamps failed for the same reasons and I removed them both, sending them to a company in Birmingham called "The Genius Of The Lamp" in Birmingham, who refurbished them perfectly. Later re-fitment made my night driving much better!
Now the hard one:
The C.V. boot re-fitment involves removing the drive shaft from the gear box, cleaning the joint with petrol, re-packing it with fresh grease, sliding a new boot over the shaft & then re-attaching it to the gear box. And that's the edited version! You can buy boots which fit over the old one and have joins held in place by clips, but in my experience these rarely last very long and fail within the year. I would advise biting the bullet and firing new C.V. boots, as once it's done, it's done! Looking at the car's mileage the old ones have lasted pretty well, so fitting identical parts would probably outlast other parts of the car. The parts are probably available through French classic car websites.