Dave, well done for persisting despite the naysayers here, self included.. I would now say you are almost there with a 100% good repair
The micro-usb socket case tabs would/should have been soldered into the board holes during production to act as strain relief.
The joints have failed. That will be a combination of poor wetting during soldering, due to plating on the tabs, not enough heat and lead free solder.
I would, with the right tools, clean up and re solder using leaded, an iron for the tabs and hot air re-flow on the pins. I have the iron but don't have hot air
I'm sure someone on YACF could help out for the cost of posting (leaving the battery for you to refit).
BTW I think the lamp is quite well designed from a reparability POV. - battery on a plug/socket and obviously able to take apart with just a screwdriver.