This seems to be a little off topic, maybe we should start a thread "how do i make my messy shop visible".
Totally agree to the "plan B" side. Luckily I found some replacement parts to fix the lamps, they do not cost too much. Soldering new SMD LEDs in was tedious and "hit and miss", my method...