not trying to be a total a*se but the missing blanks and the unclipped main earth and meter tails are class one fails (IMO)
(sorry just read your post regarding the blanks, i apologise)
The emergency light is a good idea, if you don't want to go that far i often fit a separate circuit to...