[Lucky@LeMans]

Photos below show the first fix attempt with the hinged door sitting in place. Not too bad and there is a little adjustment.
Other photos show one option for the front indicators. These are side repeaters from a Ford, KA I think. Another option is to fit a brass bulb holder with an amber bulb, but it does look like an after thought borrowed from a bed side lamp ! When the car is painted the Ford ones will blend in and not look so obvious.